From 0c9067c9a46edac5334a56c7f9c44642eba3fd30 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Fri, 20 Mar 2020 16:48:38 +0000
Subject: [PATCH] Ownership:  Fix some raw/unique ptr conversion issues

---
 .../codecs/juce_LAMEEncoderAudioFormat.cpp    | 14 +++++-----
 .../audio_cd/juce_AudioCDReader.h             |  2 +-
 .../native/juce_mac_AudioCDBurner.mm          | 26 +++++++++----------
 .../native/juce_mac_AudioCDReader.mm          |  6 ++---
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp
index b39dbbfccc..a9be6a7f32 100644
--- a/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp
+++ b/modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp
@@ -34,18 +34,18 @@ class LAMEEncoderAudioFormat::Writer   : public AudioFormatWriter
 public:
     Writer (OutputStream* destStream, const String& formatName,
             const File& appFile, int vbr, int cbr,
-            double sampleRate, unsigned int numberOfChannels,
-            int bitsPerSample, const StringPairArray& metadata)
-        : AudioFormatWriter (destStream, formatName, sampleRate,
-                             numberOfChannels, (unsigned int) bitsPerSample),
+            double sampleRateIn, unsigned int numberOfChannels,
+            int bitsPerSampleIn, const StringPairArray& metadata)
+        : AudioFormatWriter (destStream, formatName, sampleRateIn,
+                             numberOfChannels, (unsigned int) bitsPerSampleIn),
           vbrLevel (vbr), cbrBitrate (cbr)
     {
         WavAudioFormat wavFormat;
 
-        if (auto* out = tempWav.getFile().createOutputStream())
+        if (auto out = tempWav.getFile().createOutputStream())
         {
-            writer.reset (wavFormat.createWriterFor (out, sampleRate, numChannels,
-                                                     bitsPerSample, metadata, 0));
+            writer.reset (wavFormat.createWriterFor (out.release(), sampleRateIn, numChannels,
+                                                     bitsPerSampleIn, metadata, 0));
 
             args.add (appFile.getFullPathName());
 
diff --git a/modules/juce_audio_utils/audio_cd/juce_AudioCDReader.h b/modules/juce_audio_utils/audio_cd/juce_AudioCDReader.h
index 66a822f417..2a2912a3c3 100644
--- a/modules/juce_audio_utils/audio_cd/juce_AudioCDReader.h
+++ b/modules/juce_audio_utils/audio_cd/juce_AudioCDReader.h
@@ -67,7 +67,7 @@ public:
 
     //==============================================================================
     /** Destructor. */
-    ~AudioCDReader();
+    ~AudioCDReader() override;
 
     /** Implementation of the AudioFormatReader method. */
     bool readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer,
diff --git a/modules/juce_audio_utils/native/juce_mac_AudioCDBurner.mm b/modules/juce_audio_utils/native/juce_mac_AudioCDBurner.mm
index 79382604e1..c66afc347e 100644
--- a/modules/juce_audio_utils/native/juce_mac_AudioCDBurner.mm
+++ b/modules/juce_audio_utils/native/juce_mac_AudioCDBurner.mm
@@ -275,7 +275,7 @@ struct OpenDiskDevice
 };
 
 //==============================================================================
-class AudioCDBurner::Pimpl  : public Timer
+class AudioCDBurner::Pimpl  : private Timer
 {
 public:
     Pimpl (AudioCDBurner& b, int deviceIndex)  : owner (b)
@@ -288,22 +288,11 @@ public:
         }
     }
 
-    ~Pimpl()
+    ~Pimpl() override
     {
         stopTimer();
     }
 
-    void timerCallback() override
-    {
-        const DiskState state = getDiskState();
-
-        if (state != lastState)
-        {
-            lastState = state;
-            owner.sendChangeMessage();
-        }
-    }
-
     DiskState getDiskState() const
     {
         if ([device->device isValid])
@@ -364,6 +353,17 @@ public:
     std::unique_ptr<OpenDiskDevice> device;
 
 private:
+    void timerCallback() override
+    {
+        const DiskState state = getDiskState();
+
+        if (state != lastState)
+        {
+            lastState = state;
+            owner.sendChangeMessage();
+        }
+    }
+
     DiskState lastState;
     AudioCDBurner& owner;
 };
diff --git a/modules/juce_audio_utils/native/juce_mac_AudioCDReader.mm b/modules/juce_audio_utils/native/juce_mac_AudioCDReader.mm
index 6268396bbf..6f02e3e988 100644
--- a/modules/juce_audio_utils/native/juce_mac_AudioCDReader.mm
+++ b/modules/juce_audio_utils/native/juce_mac_AudioCDReader.mm
@@ -140,7 +140,7 @@ AudioCDReader* AudioCDReader::createReaderForCD (const int index)
 }
 
 AudioCDReader::AudioCDReader (const File& volume)
-   : AudioFormatReader (0, "CD Audio"),
+   : AudioFormatReader (nullptr, "CD Audio"),
      volumeDir (volume),
      currentReaderTrack (-1)
 {
@@ -202,9 +202,9 @@ bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int sta
         {
             reader = nullptr;
 
-            if (FileInputStream* const in = tracks [track].createInputStream())
+            if (auto in = tracks [track].createInputStream())
             {
-                BufferedInputStream* const bin = new BufferedInputStream (in, 65536, true);
+                BufferedInputStream* const bin = new BufferedInputStream (in.release(), 65536, true);
 
                 AiffAudioFormat format;
                 reader.reset (format.createReaderFor (bin, true));