mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Replaced all usage of ScopedPointer with std::unique_ptr

Browse source
This commit is contained in:
Tom Poole 2018-04-19 15:55:04 +01:00
parent e6104e3fed
commit ab863a6dc2
401 changed files with 1091 additions and 1113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
View file

@ -960,7 +960,7 @@ bool AiffAudioFormat::canHandleFile (const File& f)
AudioFormatReader* AiffAudioFormat::createReaderFor (InputStream* sourceStream, bool deleteStreamIfOpeningFails)
{
ScopedPointer<AiffAudioFormatReader> w (new AiffAudioFormatReader (sourceStream));
std::unique_ptr<AiffAudioFormatReader> w (new AiffAudioFormatReader (sourceStream));
if (w->sampleRate > 0 && w->numChannels > 0)
return w.release();

2
modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp
View file

@ -570,7 +570,7 @@ bool CoreAudioFormat::canDoMono() { return true; }
AudioFormatReader* CoreAudioFormat::createReaderFor (InputStream* sourceStream,
bool deleteStreamIfOpeningFails)
{
ScopedPointer<CoreAudioReader> r (new CoreAudioReader (sourceStream));
std::unique_ptr<CoreAudioReader> r (new CoreAudioReader (sourceStream));
if (r->ok)
return r.release();

4
modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
View file

@ -560,7 +560,7 @@ bool FlacAudioFormat::isCompressed() { return true; }
AudioFormatReader* FlacAudioFormat::createReaderFor (InputStream* in, const bool deleteStreamIfOpeningFails)
{
ScopedPointer<FlacReader> r (new FlacReader (in));
std::unique_ptr<FlacReader> r (new FlacReader (in));
if (r->sampleRate > 0)
return r.release();
@ -580,7 +580,7 @@ AudioFormatWriter* FlacAudioFormat::createWriterFor (OutputStream* out,
{
if (out != nullptr && getPossibleBitDepths().contains (bitsPerSample))
{
ScopedPointer<FlacWriter> w (new FlacWriter (out, sampleRate, numberOfChannels,
std::unique_ptr<FlacWriter> w (new FlacWriter (out, sampleRate, numberOfChannels,
(uint32) bitsPerSample, qualityOptionIndex));
if (w->ok)
return w.release();

6
modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp
View file

@ -44,8 +44,8 @@ public:
if (auto* out = tempWav.getFile().createOutputStream())
{
writer = wavFormat.createWriterFor (out, sampleRate, numChannels,
bitsPerSample, metadata, 0);
writer.reset (wavFormat.createWriterFor (out, sampleRate, numChannels,
bitsPerSample, metadata, 0));
args.add (appFile.getFullPathName());
@ -104,7 +104,7 @@ public:
private:
int vbrLevel, cbrBitrate;
TemporaryFile tempWav { ".wav" };
ScopedPointer<AudioFormatWriter> writer;
std::unique_ptr<AudioFormatWriter> writer;
StringArray args;
bool runLameChildProcess (const TemporaryFile& tempMP3, const StringArray& processArgs) const

2
modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
View file

@ -3132,7 +3132,7 @@ StringArray MP3AudioFormat::getQualityOptions() { return {}; }
AudioFormatReader* MP3AudioFormat::createReaderFor (InputStream* sourceStream, const bool deleteStreamIfOpeningFails)
{
ScopedPointer<MP3Decoder::MP3Reader> r (new MP3Decoder::MP3Reader (sourceStream));
std::unique_ptr<MP3Decoder::MP3Reader> r (new MP3Decoder::MP3Reader (sourceStream));
if (r->lengthInSamples > 0)
return r.release();

10
modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp
View file

@ -448,7 +448,7 @@ bool OggVorbisAudioFormat::isCompressed() { return true; }
AudioFormatReader* OggVorbisAudioFormat::createReaderFor (InputStream* in, bool deleteStreamIfOpeningFails)
{
ScopedPointer<OggReader> r (new OggReader (in));
std::unique_ptr<OggReader> r (new OggReader (in));
if (r->sampleRate > 0)
return r.release();
@ -469,9 +469,9 @@ AudioFormatWriter* OggVorbisAudioFormat::createWriterFor (OutputStream* out,
if (out == nullptr)
return nullptr;
ScopedPointer<OggWriter> w (new OggWriter (out, sampleRate, numChannels,
(unsigned int) bitsPerSample,
qualityOptionIndex, metadataValues));
std::unique_ptr<OggWriter> w (new OggWriter (out, sampleRate, numChannels,
(unsigned int) bitsPerSample,
qualityOptionIndex, metadataValues));
return w->ok ? w.release() : nullptr;
}
@ -486,7 +486,7 @@ int OggVorbisAudioFormat::estimateOggFileQuality (const File& source)
{
if (auto* in = source.createInputStream())
{
ScopedPointer<AudioFormatReader> r (createReaderFor (in, true));
std::unique_ptr<AudioFormatReader> r (createReaderFor (in, true));
if (r != nullptr)
{

24
modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp
View file

@ -849,7 +849,7 @@ namespace WavFileHelpers
{
static void addToMetadata (StringPairArray& destValues, const String& source)
{
ScopedPointer<XmlElement> xml (XmlDocument::parse (source));
std::unique_ptr<XmlElement> xml (XmlDocument::parse (source));
if (xml != nullptr && xml->hasTagName ("ebucore:ebuCoreMain"))
{
@ -1672,7 +1672,7 @@ bool WavAudioFormat::isChannelLayoutSupported (const AudioChannelSet& channelSet
AudioFormatReader* WavAudioFormat::createReaderFor (InputStream* sourceStream, bool deleteStreamIfOpeningFails)
{
ScopedPointer<WavAudioFormatReader> r (new WavAudioFormatReader (sourceStream));
std::unique_ptr<WavAudioFormatReader> r (new WavAudioFormatReader (sourceStream));
#if JUCE_USE_OGGVORBIS
if (r->isSubformatOggVorbis)
@ -1738,17 +1738,17 @@ namespace WavFileHelpers
TemporaryFile tempFile (file);
WavAudioFormat wav;
ScopedPointer<AudioFormatReader> reader (wav.createReaderFor (file.createInputStream(), true));
std::unique_ptr<AudioFormatReader> reader (wav.createReaderFor (file.createInputStream(), true));
if (reader != nullptr)
{
ScopedPointer<OutputStream> outStream (tempFile.getFile().createOutputStream());
std::unique_ptr<OutputStream> outStream (tempFile.getFile().createOutputStream());
if (outStream != nullptr)
{
ScopedPointer<AudioFormatWriter> writer (wav.createWriterFor (outStream.get(), reader->sampleRate,
reader->numChannels, (int) reader->bitsPerSample,
metadata, 0));
std::unique_ptr<AudioFormatWriter> writer (wav.createWriterFor (outStream.get(), reader->sampleRate,
reader->numChannels, (int) reader->bitsPerSample,
metadata, 0));
if (writer != nullptr)
{
@ -1771,7 +1771,7 @@ bool WavAudioFormat::replaceMetadataInFile (const File& wavFile, const StringPai
{
using namespace WavFileHelpers;
ScopedPointer<WavAudioFormatReader> reader (static_cast<WavAudioFormatReader*> (createReaderFor (wavFile.createInputStream(), true)));
std::unique_ptr<WavAudioFormatReader> reader (static_cast<WavAudioFormatReader*> (createReaderFor (wavFile.createInputStream(), true)));
if (reader != nullptr)
{
@ -1841,9 +1841,9 @@ struct WaveAudioFormatTests : public UnitTest
{
beginTest ("Creating a basic wave writer");
ScopedPointer<AudioFormatWriter> writer (format.createWriterFor (new MemoryOutputStream (memoryBlock, false),
44100.0, numTestAudioBufferChannels,
32, metadataValues, 0));
std::unique_ptr<AudioFormatWriter> writer (format.createWriterFor (new MemoryOutputStream (memoryBlock, false),
44100.0, numTestAudioBufferChannels,
32, metadataValues, 0));
expect (writer != nullptr);
AudioBuffer<float> buffer (numTestAudioBufferChannels, numTestAudioBufferSamples);
@ -1856,7 +1856,7 @@ struct WaveAudioFormatTests : public UnitTest
{
beginTest ("Creating a basic wave reader");
ScopedPointer<AudioFormatReader> reader (format.createReaderFor (new MemoryInputStream (memoryBlock, false), false));
std::unique_ptr<AudioFormatReader> reader (format.createReaderFor (new MemoryInputStream (memoryBlock, false), false));
expect (reader != nullptr);
expect (reader->metadataValues == metadataValues, "Somehow, the metadata is different!");
}

2
modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp
View file

@ -339,7 +339,7 @@ bool WindowsMediaAudioFormat::isCompressed() { return true; }
//==============================================================================
AudioFormatReader* WindowsMediaAudioFormat::createReaderFor (InputStream* sourceStream, bool deleteStreamIfOpeningFails)
{
ScopedPointer<WindowsMediaCodec::WMAudioReader> r (new WindowsMediaCodec::WMAudioReader (sourceStream));
std::unique_ptr<WindowsMediaCodec::WMAudioReader> r (new WindowsMediaCodec::WMAudioReader (sourceStream));
if (r->sampleRate > 0)
return r.release();

2
modules/juce_audio_formats/format/juce_AudioFormatManager.cpp
View file

@ -141,7 +141,7 @@ AudioFormatReader* AudioFormatManager::createReaderFor (InputStream* audioFileSt
if (audioFileStream != nullptr)
{
ScopedPointer<InputStream> in (audioFileStream);
std::unique_ptr<InputStream> in (audioFileStream);
auto originalStreamPos = in->getPosition();
for (auto* af : knownFormats)

2
modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp
View file

@ -328,7 +328,7 @@ private:
AbstractFifo fifo;
AudioBuffer<float> buffer;
TimeSliceThread& timeSliceThread;
ScopedPointer<AudioFormatWriter> writer;
std::unique_ptr<AudioFormatWriter> writer;
CriticalSection thumbnailLock;
IncomingDataReceiver* receiver;
int64 samplesWritten;

2
modules/juce_audio_formats/format/juce_AudioFormatWriter.h
View file

@ -241,7 +241,7 @@ public:
private:
class Buffer;
friend struct ContainerDeletePolicy<Buffer>;
ScopedPointer<Buffer> buffer;
std::unique_ptr<Buffer> buffer;
};
protected:

2
modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h
View file

@ -67,7 +67,7 @@ public:
int64 startSampleInFile, int numSamples) override;
private:
ScopedPointer<AudioFormatReader> source;
std::unique_ptr<AudioFormatReader> source;
TimeSliceThread& thread;
int64 nextReadPosition;
const int numBlocks;

2
modules/juce_audio_formats/format/juce_MemoryMappedAudioFormatReader.h
View file

@ -85,7 +85,7 @@ public:
protected:
File file;
Range<int64> mappedSection;
ScopedPointer<MemoryMappedFile> map;
std::unique_ptr<MemoryMappedFile> map;
int64 dataChunkStart, dataLength;
int bytesPerFrame;

2
modules/juce_audio_formats/sampler/juce_Sampler.h
View file

@ -94,7 +94,7 @@ private:
friend class SamplerVoice;
String name;
ScopedPointer<AudioBuffer<float>> data;
std::unique_ptr<AudioBuffer<float>> data;
double sourceSampleRate;
BigInteger midiNotes;
int length = 0, attackSamples = 0, releaseSamples = 0;