Fixed some errors in the examples

examples/DSP/ConvolutionDemo.h

@@ -90,8 +90,7 @@ struct ConvolutionDemoDSP
                 auto selectedType = cabinetTypeParameter->getCurrentSelectedID();
                 auto assetName = (selectedType == 2 ? "guitar_amp.wav" : "cassette_recorder.wav");
 
-                std::unique_ptr<InputStream> assetInputStream (createAssetInputStream (assetName));
-                if (assetInputStream != nullptr)
+                if (auto assetInputStream = createAssetInputStream (assetName))
                 {
                     currentCabinetData.reset();
                     assetInputStream->readIntoMemoryBlock (currentCabinetData);

examples/GUI/DialogsDemo.h

@@ -335,7 +335,7 @@ private:
                     FileOutputStream outStream (fileToSave);
 
                     if (outStream.openedOk())
-                        if (auto inStream = std::unique_ptr<InputStream> (createAssetInputStream ("juce_icon.png")))
+                        if (auto inStream = createAssetInputStream ("juce_icon.png"))
                             outStream.writeFromInputStream (*inStream, -1);
                 }
 

examples/Plugins/AUv3SynthPluginDemo.h

@@ -195,10 +195,8 @@ public:
         roomSizeSlider.setRange (0.0, 1.0);
         addAndMakeVisible (roomSizeSlider);
 
-        if (auto* assetStream = createAssetInputStream ("proaudio.path"))
+        if (auto fileStream = createAssetInputStream ("proaudio.path"))
         {
-            std::unique_ptr<InputStream> fileStream (assetStream);
-
             Path proAudioPath;
             proAudioPath.loadPathFromStream (*fileStream);
             proAudioIcon.setPath (proAudioPath);
@@ -411,13 +409,13 @@ private:
     //==============================================================================
     void loadNewSampleBinary (const void* data, int dataSize, const char* format)
     {
-        auto* soundBuffer = new MemoryInputStream (data, static_cast<std::size_t> (dataSize), false);
-        loadNewSample (soundBuffer, format);
+        auto soundBuffer = std::make_unique<MemoryInputStream> (data, static_cast<std::size_t> (dataSize), false);
+        loadNewSample (std::move (soundBuffer), format);
     }
 
-    void loadNewSample (InputStream* soundBuffer, const char* format)
+    void loadNewSample (std::unique_ptr<InputStream> soundBuffer, const char* format)
     {
-        std::unique_ptr<AudioFormatReader> formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer, true));
+        std::unique_ptr<AudioFormatReader> formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer.release(), true));
 
         BigInteger midiNotes;
         midiNotes.setRange (0, 126, true);

examples/Plugins/DSPModulePluginDemo.h

@@ -272,9 +272,7 @@ public:
             auto maxSize = static_cast<size_t> (roundToInt (getSampleRate() * (8192.0 / 44100.0)));
             auto assetName = (type == 0 ? "Impulse1.wav" : "Impulse2.wav");
 
-            std::unique_ptr<InputStream> assetInputStream (createAssetInputStream (assetName));
-
-            if (assetInputStream != nullptr)
+            if (auto assetInputStream = createAssetInputStream (assetName))
             {
                 currentCabinetData.reset();
                 assetInputStream->readIntoMemoryBlock (currentCabinetData);

examples/Plugins/MultiOutSynthPluginDemo.h

@@ -157,9 +157,9 @@ private:
         return output;
     }
 
-    void loadNewSample (InputStream* soundBuffer, const char* format)
+    void loadNewSample (std::unique_ptr<InputStream> soundBuffer, const char* format)
     {
-        std::unique_ptr<AudioFormatReader> formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer, true));
+        std::unique_ptr<AudioFormatReader> formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer.release(), true));
 
         BigInteger midiNotes;
         midiNotes.setRange (0, 126, true);

examples/Plugins/SamplerPluginDemo.h

@@ -2062,11 +2062,9 @@ public:
     SamplerAudioProcessor()
         : AudioProcessor (BusesProperties().withOutput ("Output", AudioChannelSet::stereo(), true))
     {
-        if (auto* asset = createAssetInputStream ("cello.wav"))
+        if (auto inputStream = createAssetInputStream ("cello.wav"))
         {
-            std::unique_ptr<InputStream> inputStream (asset);
             inputStream->readIntoMemoryBlock (mb);
-
             readerFactory.reset (new MemoryAudioFormatReaderFactory (mb.getData(), mb.getSize()));
         }
 

examples/Utilities/InAppPurchasesDemo.h

@@ -395,11 +395,8 @@ public:
 
                 setInterceptsMouseClicks (! hasBeenPurchased, ! hasBeenPurchased);
 
-                if (auto* assetStream = createAssetInputStream (String ("Purchases/" + String (imageResourceName)).toRawUTF8()))
-                {
-                    std::unique_ptr<InputStream> fileStream (assetStream);
+                if (auto fileStream = createAssetInputStream (String ("Purchases/" + String (imageResourceName)).toRawUTF8()))
                     avatar = PNGImageFormat().decodeImage (*fileStream);
-                }
             }
         }
     private:
@@ -569,10 +566,8 @@ private:
         {
             auto assetName = "Purchases/" + soundNames[idx] + String (phraseListBox.getSelectedRow()) + ".ogg";
 
-            if (auto* assetStream = createAssetInputStream (assetName.toRawUTF8()))
+            if (auto fileStream = createAssetInputStream (assetName.toRawUTF8()))
             {
-                std::unique_ptr<InputStream> fileStream (assetStream);
-
                 currentPhraseData.reset();
                 fileStream->readIntoMemoryBlock (currentPhraseData);