Updated JUCE, fixed a wide array of warnings and issues on Android, upgraded the ImageDemo.

Author: jrlanglois

demo/JuceLibraryCode/AppConfig.h

@@ -20,7 +20,7 @@
 
 // [END_USER_CODE_SECTION]
 
-#define JUCE_PROJUCER_VERSION 0x80007
+#define JUCE_PROJUCER_VERSION 0x80008
 
 //==============================================================================
 #define JUCE_MODULE_AVAILABLE_juce_analytics               1

demo/source/core/SharedObjects.cpp

@@ -149,15 +149,7 @@ void SharedObjects::restoreWindowDimensions (DocumentWindow& dw)
 
 Image SharedObjects::getWindowIcon()
 {
-    static Image windowIcon;
-
-    if (windowIcon.isNull())
-    {
-        windowIcon = ImageCache::getFromMemory (BinaryData::SquarePine_Logo_png, BinaryData::SquarePine_Logo_pngSize);
-        windowIcon.setBackupEnabled (false);
-    }
-
-    return windowIcon;
+    return ImageCache::getFromMemory (BinaryData::SquarePine_Logo_png, BinaryData::SquarePine_Logo_pngSize);
 }
 
 //==============================================================================

demo/source/demos/ImageDemo.h

@@ -10,10 +10,62 @@ class ImageDemo final : public DemoBase,
     {
         imageFormatManager.registerBasicFormats();
 
+        SafePointer sp (this);
+
+        open.onClick = [this, sp]()
+        {
+            if (sp == nullptr)
+                return;
+
+            if (fileChooser != nullptr)
+            {
+                return;
+            }
+
+            fileChooser = std::make_unique<FileChooser> (TRANS ("Find an image to load."),
+                                                         File::getSpecialLocation (File::userPicturesDirectory),
+                                                         imageFormatManager.getWildcardForAllFormats());
+
+            fileChooser->launchAsync (FileBrowserComponent::openMode, [sp] (const FileChooser& chooser)
+            {
+                if (sp == nullptr)
+                    return;
+
+                sp->setImage (chooser.getURLResult());
+                sp->fileChooser.reset();
+            });
+        };
+
         addAndMakeVisible (imageComponent);
         addAndMakeVisible (open);
     }
 
+    //==============================================================================
+    /** Changes the currently displayed with the given one.
+        If the given image is null, the underlying image component will be cleared.
+    */
+    void setImage (const Image& image)
+    {
+        imageComponent.setImage (image);
+        repaint();
+    }
+
+    /** Changes the currently displayed with one from the given file.
+        If the given image fails to load, the underlying image component will be cleared.
+    */
+    void setImage (const File& file)
+    {
+        setImage (imageFormatManager.loadFrom (file));
+    }
+
+    /** Changes the currently displayed with one from the given URL.
+        If the given image fails to load, the underlying image component will be cleared.
+    */
+    void setImage (const URL& url)
+    {
+        setImage (imageFormatManager.loadFrom (url));
+    }
+
     //==============================================================================
     /** @internal */
     void paint (Graphics& g) override
@@ -37,7 +89,7 @@ class ImageDemo final : public DemoBase,
     }
 
     /** @internal */
-    bool isInterestedInTextDrag (const String& text) override { return isBase64 (text); }
+    bool isInterestedInTextDrag (const String& text) override { return isPossiblyBase64 (text); }
 
     /** @internal */
     bool isInterestedInFileDrag (const StringArray& files) override
@@ -58,7 +110,7 @@ class ImageDemo final : public DemoBase,
             const File file (path);
             if (file.existsAsFile() && imageFormatManager.findFormatForFile (file) != nullptr)
             {
-                setImage (imageFormatManager.loadFrom (file));
+                setImage (file);
                 return;
             }
         }
@@ -67,7 +119,7 @@ class ImageDemo final : public DemoBase,
     /** @internal */
     void textDropped (const String& text, int, int) override
     {
-        if (isBase64 (text))
+        if (isPossiblyBase64 (text))
             setImage (imageFormatManager.fromBase64 (text));
     }
 
@@ -82,15 +134,10 @@ class ImageDemo final : public DemoBase,
     ImageFormatManager imageFormatManager;
     HighQualityImageComponent imageComponent;
     TextButton open;
+    std::unique_ptr<FileChooser> fileChooser;
 
     //==============================================================================
-    void setImage (const Image& image)
-    {
-        imageComponent.setImage (image);
-        repaint();
-    }
-
-    static bool isBase64 (const String& text)
+    static bool isPossiblyBase64 (const String& text)
     {
         const String b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 

demo/source/main/Main.cpp

@@ -64,19 +64,6 @@ class MainWindow final : public DocumentWindow
         customLookAndFeel (sharedObjects),
         mainComponent (sharedObjects)
     {
-        RuntimePermissions::request (RuntimePermissions::recordAudio, [this] (bool)
-        {
-            audioWaiter.signal();
-        });
-
-        audioWaiter.wait();
-
-        if (! RuntimePermissions::isGranted (RuntimePermissions::recordAudio))
-        {
-            closeButtonPressed();
-            return;
-        }
-
         googleAnalyticsReporter->startSession();
 
         setUsingNativeTitleBar (true);
@@ -125,7 +112,6 @@ class MainWindow final : public DocumentWindow
 
 private:
     //==============================================================================
-    WaitableEvent audioWaiter;
     SharedObjects sharedObjects;
     SharedResourcePointer<sp::GoogleAnalyticsReporter> googleAnalyticsReporter;
     DemoLookAndFeel customLookAndFeel;

demo/source/main/MainComponent.cpp

@@ -44,12 +44,11 @@ MainComponent::MainComponent (SharedObjects& sharedObjs)
     };
 
     addDemo (new EaseListComponent (sharedObjs));
-    addDemo (new EffectChainDemo (sharedObjs));
     addDemo (new ImageDemo (sharedObjs));
-    addDemo (new CodeEditorDemo (sharedObjs));
-    addDemo (new MediaDeviceListerDemo (sharedObjs));
     addDemo (new AnimationDemo (sharedObjs));
     addDemo (new ParticleSystemDemo (sharedObjs));
+    addDemo (new EffectChainDemo (sharedObjs));
+    addDemo (new MediaDeviceListerDemo (sharedObjs));
 
    #if SQUAREPINE_USE_ICUESDK
     addDemo (new iCUESDKDemo (sharedObjs));
@@ -63,6 +62,7 @@ MainComponent::MainComponent (SharedObjects& sharedObjs)
     addDemo (new OpenGLDetailsDemo (sharedObjs, rendererConfigurator));
    #endif
 
+    addDemo (new CodeEditorDemo (sharedObjs));
     addDemo (new SettingsComponent (sharedObjs));
 
     popupButton.onClick = [this, ptr = SafePointer (this)]()

modules/squarepine_animation/particles/ParticleSystem.h

@@ -185,7 +185,7 @@ class Particle
         juce::Rectangle<float> bounds;
         juce::Point<float> velocity;
         Colour colour;
-    } JUCE_PACKED;
+    };
 
     Details changeable;
 
@@ -198,7 +198,7 @@ class Particle
 
     //==============================================================================
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Particle)
-} JUCE_PACKED;
+};
 
 //==============================================================================
 class RainParticle final : public Particle
@@ -220,7 +220,7 @@ class RainParticle final : public Particle
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (RainParticle)
-} JUCE_PACKED;
+};
 
 //==============================================================================
 /**
@@ -249,7 +249,7 @@ class SnowParticle final : public Particle
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SnowParticle)
-} JUCE_PACKED;
+};
 
 #if JUCE_MSVC
  #pragma pack (pop)

modules/squarepine_audio/codecs/REXAudioFormat.cpp

@@ -178,25 +178,26 @@ namespace REXError
     #pragma pack (push, 8)
 #endif
 
-struct REXInfo
+struct REXInfo final
 {
-    REXInfo() noexcept { zerostruct (*this); }
-
-    int numChannels, sampleRate, numSlices;
-    int tempo;            // Tempo set when exported from ReCycle, 123.456 BPM stored as 123456L etc.
-    int originalTempo;    // Original tempo of loop, as calculated by ReCycle from the locator positions and bars/beats/sign settings.
-    int ppqLength, timeSignatureNumerator, timeSignatureDenominator, bitDepth;
-} JUCE_PACKED;
+    int numChannels = 0, 
+        sampleRate = 0,
+        numSlices = 0,
+        tempo = 0,                      // Tempo set when exported from ReCycle, 123.456 BPM stored as 123456L etc.
+        originalTempo = 0,              // Original tempo of loop, as calculated by ReCycle from the locator positions and bars/beats/sign settings.
+        ppqLength = 0,
+        timeSignatureNumerator = 0,
+        timeSignatureDenominator = 0,
+        bitDepth = 0;
+};
 
-struct REXSliceInfo
+struct REXSliceInfo final
 {
-    REXSliceInfo() noexcept { zerostruct (*this); }
-
-    int ppqPos;         // Position of slice in loop
-    int sampleLength;   // Length of rendered slice, at its original sample rate.
-} JUCE_PACKED;
+    int ppqPos = 0,         // Position of slice in loop
+        sampleLength = 0;   // Length of rendered slice, at its original sample rate.
+};
 
-struct REXCreatorInfo
+struct REXCreatorInfo final
 {
     REXCreatorInfo() noexcept { zerostruct (*this); }
 
@@ -207,7 +208,7 @@ struct REXCreatorInfo
     char url[kREXStringSize];
     char email[kREXStringSize];
     char freeText[kREXStringSize];
-} JUCE_PACKED;
+};
 
 #if JUCE_MSVC
     #pragma pack (pop)

modules/squarepine_core/misc/Macros.h

@@ -1,18 +1,16 @@
 /** This section removes stupid min/max macros to avoid clashing
-    with STL min/max implementations.
+    with STL min/max implementations, avoiding clashing of any kind,
+    and clearing up the already zany global namespace.
 
     Too many idiot coders enjoy redefining the min/max macros in their libraries...
     And someone behind the STL implementation at MSFT decided it was a good idea
-    to provide inane (and ugly) versions of them too! (hashtag YOLO and IHEARTRECREATINGMINMAXBRO)
-
-    This section of code should help avoid clashing of sorts,
-    and clearing up the already zany global namespace.
+    to provide inane (and ugly) versions of them too! (#YOLO #IHEARTRECREATINGMINMAXBRO)
 
-    Give me a break - use std::min() and std::max() instead!
-    JUCE is equally at fault here, with its std::min() and std::max() functions.
+    And give me a break - use std::min() and std::max() instead!
+    JUCE is equally at fault here with its jmin() and jmax() functions.
 */
 
-#undef NOMINMAX // Avoids additional clashing
+#undef NOMINMAX
 #define NOMINMAX 1
 
 #undef min
@@ -30,9 +28,11 @@
 
 //==============================================================================
 #if DOXYGEN || JUCE_WINDOWS || JUCE_LINUX || JUCE_MAC || JUCE_BSD || JUCE_WASM
-    #define SQUAREPINE_IS_DESKTOP      1 // Currently running on a desktop.
+    /** You're currently running on a desktop. */
+    #define SQUAREPINE_IS_DESKTOP      1
 #elif JUCE_ANDROID || JUCE_IPHONE || JUCE_IOS
-    #define SQUAREPINE_IS_MOBILE       1 // Currently running on a mobile device.
+    /** You're currently running on a mobile device. */
+    #define SQUAREPINE_IS_MOBILE       1
 #else
     #error "What kind of operating system is this? Please fix the project platform format macro!"
 #endif

modules/squarepine_cryptography/rng/Xorshift.cpp

@@ -134,7 +134,7 @@ class XorshiftForwarder
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (XorshiftForwarder)
-} JUCE_PACKED;
+};
 
 template<auto func, size_t numElements>
 class Xorshift64Base : public XorshiftForwarder
@@ -147,7 +147,7 @@ class Xorshift64Base : public XorshiftForwarder
 
 private:
     std::array<uint64, numElements> data;
-} JUCE_PACKED;
+};
 
 class Xorshift1024s final : public XorshiftForwarder
 {
@@ -160,7 +160,7 @@ class Xorshift1024s final : public XorshiftForwarder
 private:
     std::array<uint64, 16> data;
     int index = 0;
-} JUCE_PACKED;
+};
 
 struct Xorshift64::Pimpl final
 {
@@ -183,7 +183,7 @@ struct Xorshift64::Pimpl final
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Pimpl)
-} JUCE_PACKED;
+};
 
 #if JUCE_MSVC
  #pragma pack (pop)