Fixes to support the latest JUCE/develop.

Author: jrlanglois

demo/JuceLibraryCode/AppConfig.h

@@ -114,7 +114,7 @@
 #endif
 
 #ifndef    JUCE_USE_LAME_AUDIO_FORMAT
- #define   JUCE_USE_LAME_AUDIO_FORMAT 1
+ //#define JUCE_USE_LAME_AUDIO_FORMAT 0
 #endif
 
 #ifndef    JUCE_USE_WINDOWS_MEDIA_FORMAT

demo/SquarePineDemo.jucer

@@ -87,10 +87,10 @@
     </GROUP>
   </MAINGROUP>
   <JUCEOPTIONS JUCE_STRICT_REFCOUNTEDPOINTER="1" JUCE_USE_CAMERA="1" JUCE_USE_WINRT_MIDI="1"
-               JUCE_USE_MP3AUDIOFORMAT="1" JUCE_USE_LAME_AUDIO_FORMAT="1" JUCE_PLUGINHOST_VST3="1"
-               JUCE_PLUGINHOST_AU="1" JUCE_PLUGINHOST_LADSPA="1" JUCE_USE_WIN_WEBVIEW2="1"
-               SQUAREPINE_COMPILE_UNIT_TESTS="1" SQUAREPINE_LOG_GOOGLE_ANALYTICS="1"
-               SQUAREPINE_USE_REX_AUDIO_FORMAT="1" SQUAREPINE_LOG_OPENGL_INFO="1"/>
+               JUCE_USE_MP3AUDIOFORMAT="1" JUCE_PLUGINHOST_VST3="1" JUCE_PLUGINHOST_AU="1"
+               JUCE_PLUGINHOST_LADSPA="1" JUCE_USE_WIN_WEBVIEW2="1" SQUAREPINE_COMPILE_UNIT_TESTS="1"
+               SQUAREPINE_LOG_GOOGLE_ANALYTICS="1" SQUAREPINE_USE_REX_AUDIO_FORMAT="1"
+               SQUAREPINE_LOG_OPENGL_INFO="1"/>
   <EXPORTFORMATS>
     <ANDROIDSTUDIO targetFolder="builds/android" smallIcon="jqPxuh" bigIcon="jqPxuh"
                    androidAdditionalResourceFolders="assets/Android/res" androidTheme="@style/ActivityTheme"

modules/squarepine_audio/codecs/ALACAudioFormat.cpp

@@ -204,10 +204,11 @@ class ALACAudioFormatWriter final : public AudioFormatWriter
 {
 public:
     ALACAudioFormatWriter (OutputStream* out, double rate,
-                           unsigned int numChans, unsigned int bits,
-                           const StringPairArray&) :
-        AudioFormatWriter (out, TRANS (alac::formatName), rate, numChans, bits)
+                           int numChans, int bits,
+                           const std::unordered_map<String, String>& metadataMap) :
+        AudioFormatWriter (out, TRANS (alac::formatName), rate, (uint32) numChans, (uint32) bits)
     {
+        ignoreUnused (metadataMap); // TODO
     }
 
     ~ALACAudioFormatWriter() override
@@ -260,20 +261,19 @@ AudioFormatReader* ALACAudioFormat::createReaderFor (InputStream* sourceStream,
     return nullptr;
 }
 
-AudioFormatWriter* ALACAudioFormat::createWriterFor (OutputStream* out,
-                                                     double sampleRate,
-                                                     unsigned int numberOfChannels,
-                                                     int bitsPerSample,
-                                                     const StringPairArray& metadataValues,
-                                                     int)
+std::unique_ptr<AudioFormatWriter> ALACAudioFormat::createWriterFor (std::unique_ptr<OutputStream>& out,
+                                                                     const AudioFormatWriterOptions& options)
+
 {
     if (out != nullptr
-        && getPossibleSampleRates().contains ((int) sampleRate)
-        && getPossibleBitDepths().contains (bitsPerSample)
-        && numberOfChannels > 0
-        && isPositiveAndBelow ((int) numberOfChannels, (int) alac::maxChannels))
-        return new ALACAudioFormatWriter (out, sampleRate, numberOfChannels,
-                                          (unsigned int) bitsPerSample, metadataValues);
+        && getPossibleSampleRates().contains ((int) options.getSampleRate())
+        && getPossibleBitDepths().contains (options.getBitsPerSample())
+        && options.getNumChannels() > 0
+        && isPositiveAndBelow (options.getNumChannels(), (int) alac::maxChannels))
+    {
+        return std::make_unique<ALACAudioFormatWriter> (out.release(), options.getSampleRate(), options.getNumChannels(),
+                                                        options.getBitsPerSample(), options.getMetadataValues());
+    }
 
     return nullptr;
 }

modules/squarepine_audio/codecs/ALACAudioFormat.h

@@ -24,10 +24,7 @@ class ALACAudioFormat final : public AudioFormat
     /** @internal */
     AudioFormatReader* createReaderFor (InputStream*, bool) override;
     /** @internal */
-    AudioFormatWriter* createWriterFor (OutputStream*, double, unsigned int,
-                                        int, const StringPairArray&, int) override;
-    /** @internal */
-    using AudioFormat::createWriterFor;
+    std::unique_ptr<AudioFormatWriter> createWriterFor (std::unique_ptr<OutputStream>&, const AudioFormatWriterOptions&) override;
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ALACAudioFormat)

modules/squarepine_audio/codecs/REXAudioFormat.h

@@ -74,7 +74,7 @@ class REXAudioFormat final : public AudioFormat
     /** @internal */
     AudioFormatReader* createReaderFor (InputStream*, bool) override;
     /** @internal */
-    AudioFormatWriter* createWriterFor (OutputStream*, double, unsigned int, int, const StringPairArray&, int) override { return nullptr; }
+    std::unique_ptr<AudioFormatWriter> createWriterFor (std::unique_ptr<OutputStream>&, const AudioFormatWriterOptions&) override { return {}; }
 
 private:
     //==============================================================================