From 7035a40879daa818de6d3da736c1a25af076bdba Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 16 Mar 2020 11:24:39 +0000 Subject: [PATCH] Fixed some errors in the examples --- examples/DSP/ConvolutionDemo.h | 3 +-- examples/GUI/DialogsDemo.h | 2 +- examples/Plugins/AUv3SynthPluginDemo.h | 12 +++++------- examples/Plugins/DSPModulePluginDemo.h | 4 +--- examples/Plugins/MultiOutSynthPluginDemo.h | 4 ++-- examples/Plugins/SamplerPluginDemo.h | 4 +--- examples/Utilities/InAppPurchasesDemo.h | 9 ++------- 7 files changed, 13 insertions(+), 25 deletions(-) diff --git a/examples/DSP/ConvolutionDemo.h b/examples/DSP/ConvolutionDemo.h index c27773b1ce..26816cd46d 100644 --- a/examples/DSP/ConvolutionDemo.h +++ b/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 assetInputStream (createAssetInputStream (assetName)); - if (assetInputStream != nullptr) + if (auto assetInputStream = createAssetInputStream (assetName)) { currentCabinetData.reset(); assetInputStream->readIntoMemoryBlock (currentCabinetData); diff --git a/examples/GUI/DialogsDemo.h b/examples/GUI/DialogsDemo.h index d7e26d478e..0a2ea2fd95 100644 --- a/examples/GUI/DialogsDemo.h +++ b/examples/GUI/DialogsDemo.h @@ -335,7 +335,7 @@ private: FileOutputStream outStream (fileToSave); if (outStream.openedOk()) - if (auto inStream = std::unique_ptr (createAssetInputStream ("juce_icon.png"))) + if (auto inStream = createAssetInputStream ("juce_icon.png")) outStream.writeFromInputStream (*inStream, -1); } diff --git a/examples/Plugins/AUv3SynthPluginDemo.h b/examples/Plugins/AUv3SynthPluginDemo.h index 1dc742342d..36f58805fb 100644 --- a/examples/Plugins/AUv3SynthPluginDemo.h +++ b/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 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 (dataSize), false); - loadNewSample (soundBuffer, format); + auto soundBuffer = std::make_unique (data, static_cast (dataSize), false); + loadNewSample (std::move (soundBuffer), format); } - void loadNewSample (InputStream* soundBuffer, const char* format) + void loadNewSample (std::unique_ptr soundBuffer, const char* format) { - std::unique_ptr formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer, true)); + std::unique_ptr formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer.release(), true)); BigInteger midiNotes; midiNotes.setRange (0, 126, true); diff --git a/examples/Plugins/DSPModulePluginDemo.h b/examples/Plugins/DSPModulePluginDemo.h index 750e994f89..ff640748c0 100644 --- a/examples/Plugins/DSPModulePluginDemo.h +++ b/examples/Plugins/DSPModulePluginDemo.h @@ -272,9 +272,7 @@ public: auto maxSize = static_cast (roundToInt (getSampleRate() * (8192.0 / 44100.0))); auto assetName = (type == 0 ? "Impulse1.wav" : "Impulse2.wav"); - std::unique_ptr assetInputStream (createAssetInputStream (assetName)); - - if (assetInputStream != nullptr) + if (auto assetInputStream = createAssetInputStream (assetName)) { currentCabinetData.reset(); assetInputStream->readIntoMemoryBlock (currentCabinetData); diff --git a/examples/Plugins/MultiOutSynthPluginDemo.h b/examples/Plugins/MultiOutSynthPluginDemo.h index 0424acc264..6442077cdc 100644 --- a/examples/Plugins/MultiOutSynthPluginDemo.h +++ b/examples/Plugins/MultiOutSynthPluginDemo.h @@ -157,9 +157,9 @@ private: return output; } - void loadNewSample (InputStream* soundBuffer, const char* format) + void loadNewSample (std::unique_ptr soundBuffer, const char* format) { - std::unique_ptr formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer, true)); + std::unique_ptr formatReader (formatManager.findFormatForFileExtension (format)->createReaderFor (soundBuffer.release(), true)); BigInteger midiNotes; midiNotes.setRange (0, 126, true); diff --git a/examples/Plugins/SamplerPluginDemo.h b/examples/Plugins/SamplerPluginDemo.h index 107fb664ee..0596c3b427 100644 --- a/examples/Plugins/SamplerPluginDemo.h +++ b/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 (asset); inputStream->readIntoMemoryBlock (mb); - readerFactory.reset (new MemoryAudioFormatReaderFactory (mb.getData(), mb.getSize())); } diff --git a/examples/Utilities/InAppPurchasesDemo.h b/examples/Utilities/InAppPurchasesDemo.h index 7937857d6f..af585a6187 100644 --- a/examples/Utilities/InAppPurchasesDemo.h +++ b/examples/Utilities/InAppPurchasesDemo.h @@ -395,11 +395,8 @@ public: setInterceptsMouseClicks (! hasBeenPurchased, ! hasBeenPurchased); - if (auto* assetStream = createAssetInputStream (String ("Purchases/" + String (imageResourceName)).toRawUTF8())) - { - std::unique_ptr 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 fileStream (assetStream); - currentPhraseData.reset(); fileStream->readIntoMemoryBlock (currentPhraseData);