@@ -44,8 +44,6 @@ public: | |||||
//============================================================================== | //============================================================================== | ||||
void initialise (const String& commandLine) | void initialise (const String& commandLine) | ||||
{ | { | ||||
initialiseLogger ("log_"); | |||||
LookAndFeel::setDefaultLookAndFeel (&lookAndFeel); | LookAndFeel::setDefaultLookAndFeel (&lookAndFeel); | ||||
settings = new StoredSettings(); | settings = new StoredSettings(); | ||||
settings->initialise(); | settings->initialise(); | ||||
@@ -62,6 +60,8 @@ public: | |||||
} | } | ||||
} | } | ||||
initialiseLogger ("log_"); | |||||
if (sendCommandLineToPreexistingInstance()) | if (sendCommandLineToPreexistingInstance()) | ||||
{ | { | ||||
DBG ("Another instance is running - quitting..."); | DBG ("Another instance is running - quitting..."); | ||||
@@ -271,6 +271,7 @@ private: | |||||
XmlElement* app = manifest->createNewChildElement ("application"); | XmlElement* app = manifest->createNewChildElement ("application"); | ||||
app->setAttribute ("android:label", "@string/app_name"); | app->setAttribute ("android:label", "@string/app_name"); | ||||
app->setAttribute ("android:icon", "@drawable/icon"); | app->setAttribute ("android:icon", "@drawable/icon"); | ||||
app->setAttribute ("android:hardwareAccelerated", "false"); // (using the 2D acceleration slows down openGL) | |||||
XmlElement* act = app->createNewChildElement ("activity"); | XmlElement* act = app->createNewChildElement ("activity"); | ||||
act->setAttribute ("android:name", getActivityName()); | act->setAttribute ("android:name", getActivityName()); | ||||
@@ -101,6 +101,7 @@ namespace | |||||
Project& project = projectSaver.getProject(); | Project& project = projectSaver.getProject(); | ||||
StringPairArray flags; | StringPairArray flags; | ||||
//flags.set ("JUCE_MODAL_LOOPS_PERMITTED", "0"); | |||||
flags.set ("JucePlugin_Build_VST", valueToBool (shouldBuildVST (project))); | flags.set ("JucePlugin_Build_VST", valueToBool (shouldBuildVST (project))); | ||||
flags.set ("JucePlugin_Build_AU", valueToBool (shouldBuildAU (project))); | flags.set ("JucePlugin_Build_AU", valueToBool (shouldBuildAU (project))); | ||||
flags.set ("JucePlugin_Build_RTAS", valueToBool (shouldBuildRTAS (project))); | flags.set ("JucePlugin_Build_RTAS", valueToBool (shouldBuildRTAS (project))); | ||||
@@ -7,7 +7,7 @@ | |||||
<uses-permission android:name="android.permission.RECORD_AUDIO"/> | <uses-permission android:name="android.permission.RECORD_AUDIO"/> | ||||
<uses-permission android:name="android.permission.INTERNET"/> | <uses-permission android:name="android.permission.INTERNET"/> | ||||
<uses-feature android:glEsVersion="0x00020000" android:required="true"/> | <uses-feature android:glEsVersion="0x00020000" android:required="true"/> | ||||
<application android:label="@string/app_name" android:icon="@drawable/icon"> | |||||
<application android:label="@string/app_name" android:icon="@drawable/icon" android:hardwareAccelerated="false"> | |||||
<activity android:name="JuceDemo" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation"> | <activity android:name="JuceDemo" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation"> | ||||
<intent-filter> | <intent-filter> | ||||
<action android:name="android.intent.action.MAIN"/> | <action android:name="android.intent.action.MAIN"/> | ||||
@@ -295,8 +295,7 @@ private: | |||||
HeapBlockHelper::ThrowOnFail<throwOnFailure>::check (data); | HeapBlockHelper::ThrowOnFail<throwOnFailure>::check (data); | ||||
} | } | ||||
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HeapBlock); | |||||
JUCE_DECLARE_NON_COPYABLE (HeapBlock); | |||||
JUCE_PREVENT_HEAP_ALLOCATION; // Creating a 'new HeapBlock' would be missing the point! | JUCE_PREVENT_HEAP_ALLOCATION; // Creating a 'new HeapBlock' would be missing the point! | ||||
}; | }; | ||||
@@ -272,7 +272,7 @@ namespace juce | |||||
//============================================================================== | //============================================================================== | ||||
#if JUCE_ANDROID && ! DOXYGEN | #if JUCE_ANDROID && ! DOXYGEN | ||||
#define JUCE_MODAL_LOOPS_PERMITTED 0 | #define JUCE_MODAL_LOOPS_PERMITTED 0 | ||||
#else | |||||
#elif ! defined (JUCE_MODAL_LOOPS_PERMITTED) | |||||
/** Some operating environments don't provide a modal loop mechanism, so this flag can be | /** Some operating environments don't provide a modal loop mechanism, so this flag can be | ||||
used to disable any functions that try to run a modal loop. */ | used to disable any functions that try to run a modal loop. */ | ||||
#define JUCE_MODAL_LOOPS_PERMITTED 1 | #define JUCE_MODAL_LOOPS_PERMITTED 1 | ||||
@@ -47,22 +47,20 @@ AlertWindow::AlertWindow (const String& title, | |||||
setMessage (message); | setMessage (message); | ||||
for (int i = Desktop::getInstance().getNumComponents(); --i >= 0;) | |||||
Desktop& desktop = Desktop::getInstance(); | |||||
for (int i = desktop.getNumComponents(); --i >= 0;) | |||||
{ | { | ||||
Component* const c = Desktop::getInstance().getComponent (i); | |||||
if (c != nullptr && c->isAlwaysOnTop() && c->isShowing()) | |||||
if (Component* const c = desktop.getComponent (i)) | |||||
{ | { | ||||
setAlwaysOnTop (true); | |||||
break; | |||||
if (c->isAlwaysOnTop() && c->isShowing()) | |||||
{ | |||||
setAlwaysOnTop (true); | |||||
break; | |||||
} | |||||
} | } | ||||
} | } | ||||
if (! JUCEApplication::isStandaloneApp()) | |||||
setAlwaysOnTop (true); // for a plugin, make it always-on-top because the host windows are often top-level | |||||
AlertWindow::lookAndFeelChanged(); | AlertWindow::lookAndFeelChanged(); | ||||
constrainer.setMinimumOnscreenAmounts (0x10000, 0x10000, 0x10000, 0x10000); | constrainer.setMinimumOnscreenAmounts (0x10000, 0x10000, 0x10000, 0x10000); | ||||
} | } | ||||