Using std::unique_ptr instead of deprecated juce::ScopedPointer

HiFi-LoFi · Oct 17, 2019 · c982fda · c982fda
1 parent d6887e7
commit c982fda
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 45 deletions.
diff --git a/Source/ChangeNotifier.h b/Source/ChangeNotifier.h
@@ -18,7 +18,7 @@
 #ifndef _CHANGENOTIFIER_H
 #define _CHANGENOTIFIER_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include <set>
 

diff --git a/Source/Convolver.cpp b/Source/Convolver.cpp
@@ -68,7 +68,7 @@ Convolver::Convolver() :
   _backgroundProcessingFinished(1),
   _backgroundProcessingFinishedEvent(true)
 {
-  _thread = new ConvolverBackgroundThread(*this);
+  _thread.reset(new ConvolverBackgroundThread(*this));
   _backgroundProcessingFinishedEvent.signal();
 }
 

diff --git a/Source/Convolver.h b/Source/Convolver.h
@@ -23,7 +23,7 @@
 // http://www.juce.com/forum/topic/reference-point-ambiguous
 #include "FFTConvolver/TwoStageFFTConvolver.h"
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 
 
@@ -40,7 +40,7 @@ class Convolver : public fftconvolver::TwoStageFFTConvolver
 private:
   friend class ConvolverBackgroundThread;
 
-  juce::ScopedPointer<juce::Thread> _thread;
+  std::unique_ptr<juce::Thread> _thread;
   std::atomic<uint32> _backgroundProcessingFinished;
   juce::WaitableEvent _backgroundProcessingFinishedEvent;
 };

diff --git a/Source/DecibelScaling.h b/Source/DecibelScaling.h
@@ -19,7 +19,7 @@
 #define _DECIBELSCALING_H
 
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 
 struct DecibelScaling

diff --git a/Source/IRAgent.h b/Source/IRAgent.h
@@ -18,7 +18,7 @@
 #ifndef _IRAGENT_H
 #define _IRAGENT_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "ChangeNotifier.h"
 #include "CookbookEq.h"

diff --git a/Source/IRCalculation.cpp b/Source/IRCalculation.cpp
@@ -227,10 +227,10 @@ void IRCalculation::run()
   _processor.setParameter(Parameters::AutoGainDecibels, DecibelScaling::Gain2Db(autoGain));
   for (size_t i=0; i<agents.size(); ++i)
   {
-    juce::ScopedPointer<Convolver> convolver(new Convolver());
+    std::unique_ptr<Convolver> convolver(new Convolver());
     if (buffers[i] != nullptr && buffers[i]->getSize() > 0)
     {        
-      convolver = new Convolver();
+      convolver.reset(new Convolver());
       const bool successInit = convolver->init(headBlockSize, tailBlockSize, buffers[i]->data(), buffers[i]->getSize());
       if (!successInit || threadShouldExit())
       {

diff --git a/Source/IRCalculation.h b/Source/IRCalculation.h
@@ -18,7 +18,7 @@
 #ifndef _IRMANAGER_H
 #define _IRMANAGER_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "Processor.h"
 

diff --git a/Source/LevelMeasurement.h b/Source/LevelMeasurement.h
@@ -18,7 +18,7 @@
 #ifndef _LEVELMEASUREMENT_H
 #define _LEVELMEASUREMENT_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include <cstddef>
 

diff --git a/Source/Parameters.h b/Source/Parameters.h
@@ -18,7 +18,7 @@
 #ifndef _PARAMETERS_H
 #define _PARAMETERS_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "ParameterSet.h"
 

diff --git a/Source/Persistence.h b/Source/Persistence.h
@@ -19,7 +19,7 @@
 #define _PERSISTENCE_H
 
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 #include "Processor.h"
 
 

diff --git a/Source/Processor.cpp b/Source/Processor.cpp
@@ -426,7 +426,7 @@ AudioProcessorEditor* Processor::createEditor()
 void Processor::getStateInformation (MemoryBlock& destData)
 {
   const juce::File irDirectory = _settings.getImpulseResponseDirectory();
-  juce::ScopedPointer<juce::XmlElement> element(SaveState(irDirectory, *this));
+  std::unique_ptr<juce::XmlElement> element(SaveState(irDirectory, *this));
   if (element)
   {
     copyXmlToBinary(*element, destData);
@@ -841,7 +841,7 @@ void Processor::updateConvolvers()
     _irCalculation->stopThread(-1);
     _irCalculation = nullptr;
   }
-  _irCalculation = new IRCalculation(*this);
+  _irCalculation.reset(new IRCalculation(*this));
 }
 
 

diff --git a/Source/Processor.h b/Source/Processor.h
@@ -18,7 +18,7 @@
 #ifndef _PROCESSOR_H
 #define _PROCESSOR_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "ChangeNotifier.h"
 #include "IRAgent.h"
@@ -184,7 +184,7 @@ class Processor : public AudioProcessor, public ChangeNotifier
   std::atomic<float> _beatsPerMinute;
 
   mutable juce::CriticalSection _irCalculationMutex;
-  juce::ScopedPointer<juce::Thread> _irCalculation;
+  std::unique_ptr<juce::Thread> _irCalculation;
 
   //==============================================================================
   JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Processor);

diff --git a/Source/Settings.h b/Source/Settings.h
@@ -18,7 +18,7 @@
 #ifndef _SETTINGS_H
 #define _SETTINGS_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 
 class Settings

diff --git a/Source/UI/CustomLookAndFeel.h b/Source/UI/CustomLookAndFeel.h
@@ -18,7 +18,7 @@
 #ifndef _CUSTOMLOOKANDFEEL_H
 #define _CUSTOMLOOKANDFEEL_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 class CustomLookAndFeel : public juce::LookAndFeel_V3
 {

diff --git a/Source/UI/DecibelScale.h b/Source/UI/DecibelScale.h
@@ -19,7 +19,7 @@
 #define _DECIBELSCALE_H
 
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "CustomLookAndFeel.h"
 #include "../DecibelScaling.h"

diff --git a/Source/UI/IRBrowserComponent.cpp b/Source/UI/IRBrowserComponent.cpp
@@ -59,25 +59,25 @@ void IRBrowserComponent::init(Processor* processor)
 
   if (!_timeSliceThread)
   {
-    _timeSliceThread = new juce::TimeSliceThread("IRBrowserThread");
+    _timeSliceThread.reset(new juce::TimeSliceThread("IRBrowserThread"));
     _timeSliceThread->startThread();
   }
 
   juce::AudioFormatManager formatManager;
   formatManager.registerBasicFormats();
-  _fileFilter = new juce::WildcardFileFilter(formatManager.getWildcardForAllFormats(),
+  _fileFilter.reset(new juce::WildcardFileFilter(formatManager.getWildcardForAllFormats(),
                                                                       "*",
-                                                                      "Audio Files");
+                                                                      "Audio Files"));
 
-  _directoryContent = new juce::DirectoryContentsList(_fileFilter, *_timeSliceThread);
+  _directoryContent.reset(new juce::DirectoryContentsList(_fileFilter.get(), *_timeSliceThread));
   _directoryContent->setDirectory(settings ? settings->getImpulseResponseDirectory() : juce::File(), true, true);
 
-  _fileTreeComponent = new juce::FileTreeComponent(*_directoryContent);
+  _fileTreeComponent.reset(new juce::FileTreeComponent(*_directoryContent));
   _fileTreeComponent->addListener(this);
-  addAndMakeVisible(_fileTreeComponent);
+  addAndMakeVisible(_fileTreeComponent.get());
 
-  _infoLabel = new juce::Label();
-  addAndMakeVisible(_infoLabel);
+  _infoLabel.reset(new juce::Label());
+  addAndMakeVisible(_infoLabel.get());
 
   updateLayout();
 }
@@ -287,7 +287,7 @@ bool IRBrowserComponent::readAudioFileInfo(const juce::File& file, size_t& chann
 {
   juce::AudioFormatManager formatManager;
   formatManager.registerBasicFormats();
-  juce::ScopedPointer<juce::AudioFormatReader> reader(formatManager.createReaderFor(file));
+  std::unique_ptr<juce::AudioFormatReader> reader(formatManager.createReaderFor(file));
   if (reader)
   {
     channelCount = static_cast<size_t>(reader->numChannels);

diff --git a/Source/UI/IRBrowserComponent.h b/Source/UI/IRBrowserComponent.h
@@ -19,7 +19,7 @@
 #define _IRBROWSERCOMPONENT_H
 
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "../Processor.h"
 #include "../Settings.h"
@@ -59,11 +59,11 @@ class IRBrowserComponent : public juce::Component,
                                          const size_t sampleCount,
                                          const double sampleRate) const;
 
-  juce::ScopedPointer<juce::TimeSliceThread> _timeSliceThread;
-  juce::ScopedPointer<juce::FileFilter> _fileFilter;
-  juce::ScopedPointer<juce::DirectoryContentsList> _directoryContent;
-  juce::ScopedPointer<juce::FileTreeComponent> _fileTreeComponent;
-  juce::ScopedPointer<juce::Label> _infoLabel;
+  std::unique_ptr<juce::TimeSliceThread> _timeSliceThread;
+  std::unique_ptr<juce::FileFilter> _fileFilter;
+  std::unique_ptr<juce::DirectoryContentsList> _directoryContent;
+  std::unique_ptr<juce::FileTreeComponent> _fileTreeComponent;
+  std::unique_ptr<juce::Label> _infoLabel;
   Processor* _processor;
 
   IRBrowserComponent(const IRBrowserComponent&);

diff --git a/Source/UI/IRComponent.h b/Source/UI/IRComponent.h
@@ -23,7 +23,7 @@
 #define __JUCER_HEADER_IRCOMPONENT_IRCOMPONENT_7F964DEC__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "WaveformComponent.h"
 #include "../IRAgent.h"

diff --git a/Source/UI/KlangFalterEditor.h b/Source/UI/KlangFalterEditor.h
@@ -23,7 +23,7 @@
 #define __JUCER_HEADER_KLANGFALTEREDITOR_KLANGFALTEREDITOR_F5E4498E__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "CustomLookAndFeel.h"
 #include "DecibelScale.h"

diff --git a/Source/UI/LevelMeter.h b/Source/UI/LevelMeter.h
@@ -18,7 +18,7 @@
 #ifndef _LEVELMETER_H
 #define _LEVELMETER_H
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "CustomLookAndFeel.h"
 #include "../LevelMeasurement.h"

diff --git a/Source/UI/SettingsDialogComponent.cpp b/Source/UI/SettingsDialogComponent.cpp
@@ -189,13 +189,15 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor)
 
     //[UserPreSize]
     const juce::File irDirectory = _processor.getSettings().getImpulseResponseDirectory();
-    _irDirectoryBrowserComponent = new juce::FileBrowserComponent(juce::FileBrowserComponent::openMode | juce::FileBrowserComponent::canSelectDirectories | juce::FileBrowserComponent::filenameBoxIsReadOnly,
-        irDirectory,
-        nullptr,
-        nullptr);
+    _irDirectoryBrowserComponent.reset(new juce::FileBrowserComponent(juce::FileBrowserComponent::openMode |
+                                                                      juce::FileBrowserComponent::canSelectDirectories |
+                                                                      juce::FileBrowserComponent::filenameBoxIsReadOnly,
+                                                                      irDirectory,
+                                                                      nullptr,
+                                                                      nullptr));
     _irDirectoryBrowserComponent->setFilenameBoxLabel(juce::String("Folder:"));
     _irDirectoryBrowserComponent->setFileName(irDirectory.getFullPathName());
-    _irDirectoryGroupComponent->addAndMakeVisible(_irDirectoryBrowserComponent);
+    _irDirectoryGroupComponent->addAndMakeVisible(_irDirectoryBrowserComponent.get());
     //[/UserPreSize]
 
     setSize(504, 580);

diff --git a/Source/UI/SettingsDialogComponent.h b/Source/UI/SettingsDialogComponent.h
@@ -23,7 +23,7 @@
 #define __JUCER_HEADER_SETTINGSDIALOGCOMPONENT_SETTINGSDIALOGCOMPONENT_9545D2EA__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "../Processor.h"
 //[/Headers]
@@ -65,7 +65,7 @@ class SettingsDialogComponent  : public Component,
 private:
     //[UserVariables]   -- You can add your own custom variables in this section.
     Processor& _processor;
-    juce::ScopedPointer<juce::FileBrowserComponent> _irDirectoryBrowserComponent;
+    std::unique_ptr<juce::FileBrowserComponent> _irDirectoryBrowserComponent;
     //[/UserVariables]
 
     //==============================================================================

diff --git a/Source/UI/WaveformComponent.h b/Source/UI/WaveformComponent.h
@@ -19,7 +19,7 @@
 #define _WAVEFORMCOMPONENT_H
 
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include "JuceHeader.h"
 
 #include "CustomLookAndFeel.h"
 #include "../Envelope.h"