mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-21 01:24:21 +00:00
Code Activity

Browse source
This commit is contained in:
jules 2007-07-26 10:54:47 +00:00
parent 7182195672
commit e4304ef483
5 changed files with 58 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/juce_appframework/application/juce_Application.cpp
View file

@ -68,12 +68,12 @@ JUCEApplication::~JUCEApplication()
{
}
JUCEApplication* JUCEApplication::getInstance()
JUCEApplication* JUCEApplication::getInstance() throw()
{
return appInstance;
}
bool JUCEApplication::isInitialising() const
bool JUCEApplication::isInitialising() const throw()
{
return stillInitialising;
}
@ -155,20 +155,6 @@ bool JUCEApplication::perform (const InvocationInfo& info)
}
//==============================================================================
// used as a listener object later on..
class NewAppListener : public ActionListener
{
public:
void actionListenerCallback (const String& message)
{
if (message.startsWith (appInstance->getApplicationName() + T("/")))
{
appInstance->anotherInstanceStarted (message.fromFirstOccurrenceOf (T("/"),
false, false));
}
}
};
int JUCEApplication::main (String& commandLine, JUCEApplication* const app)
{
jassert (appInstance == 0);
@ -185,8 +171,7 @@ int JUCEApplication::main (String& commandLine, JUCEApplication* const app)
if (! appLock->enter(0))
{
MessageManager::broadcastMessage (app->getApplicationName()
+ T("/") + commandLine);
MessageManager::broadcastMessage (app->getApplicationName() + "/" + commandLine);
delete appInstance;
appInstance = 0;
@ -207,16 +192,14 @@ int JUCEApplication::main (String& commandLine, JUCEApplication* const app)
commandLine = String::empty;
// register for broadcast new app messages
NewAppListener* const newAppListener = new NewAppListener();
MessageManager::getInstance()->registerBroadcastListener (newAppListener);
MessageManager::getInstance()->registerBroadcastListener (app);
app->stillInitialising = false;
// now loop until a quit message is received..
useForce = MessageManager::getInstance()->runDispatchLoop();
delete newAppListener;
MessageManager::getInstance()->deregisterBroadcastListener (app);
if (appLock != 0)
{
@ -297,6 +280,13 @@ int JUCEApplication::main (int argc, char* argv[],
return JUCEApplication::main (cmd, newApp);
}
void JUCEApplication::actionListenerCallback (const String& message)
{
if (message.startsWith (getApplicationName() + "/"))
{
anotherInstanceStarted (message.fromFirstOccurrenceOf (T("/"), false, false));
}
}
//==============================================================================
static bool juceInitialisedGUI = false;