diff --git a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp index 4b7b4683a9..fb0b44e7d9 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp +++ b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp @@ -23,16 +23,16 @@ namespace juce { -void AudioDataConverters::convertFloatToInt16LE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToInt16LE (const float* source, void* dest, int numSamples, int destBytesPerSample) { - const double maxVal = (double) 0x7fff; - char* intData = static_cast (dest); + auto maxVal = (double) 0x7fff; + auto intData = static_cast (dest); if (dest != (void*) source || destBytesPerSample <= 4) { for (int i = 0; i < numSamples; ++i) { - *(uint16*) intData = ByteOrder::swapIfBigEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfBigEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); intData += destBytesPerSample; } } @@ -43,21 +43,21 @@ void AudioDataConverters::convertFloatToInt16LE (const float* source, void* dest for (int i = numSamples; --i >= 0;) { intData -= destBytesPerSample; - *(uint16*) intData = ByteOrder::swapIfBigEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfBigEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); } } } -void AudioDataConverters::convertFloatToInt16BE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToInt16BE (const float* source, void* dest, int numSamples, int destBytesPerSample) { - const double maxVal = (double) 0x7fff; - char* intData = static_cast (dest); + auto maxVal = (double) 0x7fff; + auto intData = static_cast (dest); if (dest != (void*) source || destBytesPerSample <= 4) { for (int i = 0; i < numSamples; ++i) { - *(uint16*) intData = ByteOrder::swapIfLittleEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfLittleEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); intData += destBytesPerSample; } } @@ -68,15 +68,15 @@ void AudioDataConverters::convertFloatToInt16BE (const float* source, void* dest for (int i = numSamples; --i >= 0;) { intData -= destBytesPerSample; - *(uint16*) intData = ByteOrder::swapIfLittleEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfLittleEndian ((uint16) (short) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); } } } -void AudioDataConverters::convertFloatToInt24LE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToInt24LE (const float* source, void* dest, int numSamples, int destBytesPerSample) { - const double maxVal = (double) 0x7fffff; - char* intData = static_cast (dest); + auto maxVal = (double) 0x7fffff; + auto intData = static_cast (dest); if (dest != (void*) source || destBytesPerSample <= 4) { @@ -98,10 +98,10 @@ void AudioDataConverters::convertFloatToInt24LE (const float* source, void* dest } } -void AudioDataConverters::convertFloatToInt24BE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToInt24BE (const float* source, void* dest, int numSamples, int destBytesPerSample) { - const double maxVal = (double) 0x7fffff; - char* intData = static_cast (dest); + auto maxVal = (double) 0x7fffff; + auto intData = static_cast (dest); if (dest != (void*) source || destBytesPerSample <= 4) { @@ -123,16 +123,16 @@ void AudioDataConverters::convertFloatToInt24BE (const float* source, void* dest } } -void AudioDataConverters::convertFloatToInt32LE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToInt32LE (const float* source, void* dest, int numSamples, int destBytesPerSample) { - const double maxVal = (double) 0x7fffffff; - char* intData = static_cast (dest); + auto maxVal = (double) 0x7fffffff; + auto intData = static_cast (dest); if (dest != (void*) source || destBytesPerSample <= 4) { for (int i = 0; i < numSamples; ++i) { - *(uint32*)intData = ByteOrder::swapIfBigEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfBigEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); intData += destBytesPerSample; } } @@ -143,21 +143,21 @@ void AudioDataConverters::convertFloatToInt32LE (const float* source, void* dest for (int i = numSamples; --i >= 0;) { intData -= destBytesPerSample; - *(uint32*)intData = ByteOrder::swapIfBigEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfBigEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); } } } -void AudioDataConverters::convertFloatToInt32BE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToInt32BE (const float* source, void* dest, int numSamples, int destBytesPerSample) { - const double maxVal = (double) 0x7fffffff; - char* intData = static_cast (dest); + auto maxVal = (double) 0x7fffffff; + auto intData = static_cast (dest); if (dest != (void*) source || destBytesPerSample <= 4) { for (int i = 0; i < numSamples; ++i) { - *(uint32*)intData = ByteOrder::swapIfLittleEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfLittleEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); intData += destBytesPerSample; } } @@ -168,12 +168,12 @@ void AudioDataConverters::convertFloatToInt32BE (const float* source, void* dest for (int i = numSamples; --i >= 0;) { intData -= destBytesPerSample; - *(uint32*)intData = ByteOrder::swapIfLittleEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); + *reinterpret_cast (intData) = ByteOrder::swapIfLittleEndian ((uint32) roundToInt (jlimit (-maxVal, maxVal, maxVal * source[i]))); } } } -void AudioDataConverters::convertFloatToFloat32LE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToFloat32LE (const float* source, void* dest, int numSamples, int destBytesPerSample) { jassert (dest != (void*) source || destBytesPerSample <= 4); // This op can't be performed on in-place data! @@ -181,28 +181,28 @@ void AudioDataConverters::convertFloatToFloat32LE (const float* source, void* de for (int i = 0; i < numSamples; ++i) { - *(float*) d = source[i]; + *reinterpret_cast (d) = source[i]; #if JUCE_BIG_ENDIAN - *(uint32*) d = ByteOrder::swap (*(uint32*) d); + *reinterpret_cast (d) = ByteOrder::swap (*reinterpret_cast (d)); #endif d += destBytesPerSample; } } -void AudioDataConverters::convertFloatToFloat32BE (const float* source, void* dest, int numSamples, const int destBytesPerSample) +void AudioDataConverters::convertFloatToFloat32BE (const float* source, void* dest, int numSamples, int destBytesPerSample) { jassert (dest != (void*) source || destBytesPerSample <= 4); // This op can't be performed on in-place data! - char* d = static_cast (dest); + auto d = static_cast (dest); for (int i = 0; i < numSamples; ++i) { - *(float*) d = source[i]; + *reinterpret_cast (d) = source[i]; #if JUCE_LITTLE_ENDIAN - *(uint32*) d = ByteOrder::swap (*(uint32*) d); + *reinterpret_cast (d) = ByteOrder::swap (*reinterpret_cast (d)); #endif d += destBytesPerSample; @@ -210,16 +210,16 @@ void AudioDataConverters::convertFloatToFloat32BE (const float* source, void* de } //============================================================================== -void AudioDataConverters::convertInt16LEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertInt16LEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { const float scale = 1.0f / 0x7fff; - const char* intData = static_cast (source); + auto intData = static_cast (source); if (source != (void*) dest || srcBytesPerSample >= 4) { for (int i = 0; i < numSamples; ++i) { - dest[i] = scale * (short) ByteOrder::swapIfBigEndian (*(uint16*)intData); + dest[i] = scale * (short) ByteOrder::swapIfBigEndian (*reinterpret_cast (intData)); intData += srcBytesPerSample; } } @@ -230,21 +230,21 @@ void AudioDataConverters::convertInt16LEToFloat (const void* const source, float for (int i = numSamples; --i >= 0;) { intData -= srcBytesPerSample; - dest[i] = scale * (short) ByteOrder::swapIfBigEndian (*(uint16*)intData); + dest[i] = scale * (short) ByteOrder::swapIfBigEndian (*reinterpret_cast (intData)); } } } -void AudioDataConverters::convertInt16BEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertInt16BEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { const float scale = 1.0f / 0x7fff; - const char* intData = static_cast (source); + auto intData = static_cast (source); if (source != (void*) dest || srcBytesPerSample >= 4) { for (int i = 0; i < numSamples; ++i) { - dest[i] = scale * (short) ByteOrder::swapIfLittleEndian (*(uint16*)intData); + dest[i] = scale * (short) ByteOrder::swapIfLittleEndian (*reinterpret_cast (intData)); intData += srcBytesPerSample; } } @@ -255,15 +255,15 @@ void AudioDataConverters::convertInt16BEToFloat (const void* const source, float for (int i = numSamples; --i >= 0;) { intData -= srcBytesPerSample; - dest[i] = scale * (short) ByteOrder::swapIfLittleEndian (*(uint16*)intData); + dest[i] = scale * (short) ByteOrder::swapIfLittleEndian (*reinterpret_cast (intData)); } } } -void AudioDataConverters::convertInt24LEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertInt24LEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { const float scale = 1.0f / 0x7fffff; - const char* intData = static_cast (source); + auto intData = static_cast (source); if (source != (void*) dest || srcBytesPerSample >= 4) { @@ -285,10 +285,10 @@ void AudioDataConverters::convertInt24LEToFloat (const void* const source, float } } -void AudioDataConverters::convertInt24BEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertInt24BEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { const float scale = 1.0f / 0x7fffff; - const char* intData = static_cast (source); + auto intData = static_cast (source); if (source != (void*) dest || srcBytesPerSample >= 4) { @@ -310,16 +310,16 @@ void AudioDataConverters::convertInt24BEToFloat (const void* const source, float } } -void AudioDataConverters::convertInt32LEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertInt32LEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { - const auto scale = 1.0f / (float) 0x7fffffff; - const char* intData = static_cast (source); + const float scale = 1.0f / (float) 0x7fffffff; + auto intData = static_cast (source); if (source != (void*) dest || srcBytesPerSample >= 4) { for (int i = 0; i < numSamples; ++i) { - dest[i] = scale * (int) ByteOrder::swapIfBigEndian (*(uint32*) intData); + dest[i] = scale * (int) ByteOrder::swapIfBigEndian (*reinterpret_cast (intData)); intData += srcBytesPerSample; } } @@ -330,21 +330,21 @@ void AudioDataConverters::convertInt32LEToFloat (const void* const source, float for (int i = numSamples; --i >= 0;) { intData -= srcBytesPerSample; - dest[i] = scale * (int) ByteOrder::swapIfBigEndian (*(uint32*) intData); + dest[i] = scale * (int) ByteOrder::swapIfBigEndian (*reinterpret_cast (intData)); } } } -void AudioDataConverters::convertInt32BEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertInt32BEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { - const auto scale = 1.0f / (float) 0x7fffffff; - const char* intData = static_cast (source); + const float scale = 1.0f / (float) 0x7fffffff; + auto intData = static_cast (source); if (source != (void*) dest || srcBytesPerSample >= 4) { for (int i = 0; i < numSamples; ++i) { - dest[i] = scale * (int) ByteOrder::swapIfLittleEndian (*(uint32*) intData); + dest[i] = scale * (int) ByteOrder::swapIfLittleEndian (*reinterpret_cast (intData)); intData += srcBytesPerSample; } } @@ -355,21 +355,21 @@ void AudioDataConverters::convertInt32BEToFloat (const void* const source, float for (int i = numSamples; --i >= 0;) { intData -= srcBytesPerSample; - dest[i] = scale * (int) ByteOrder::swapIfLittleEndian (*(uint32*) intData); + dest[i] = scale * (int) ByteOrder::swapIfLittleEndian (*reinterpret_cast (intData)); } } } -void AudioDataConverters::convertFloat32LEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertFloat32LEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { - const char* s = static_cast (source); + auto s = static_cast (source); for (int i = 0; i < numSamples; ++i) { - dest[i] = *(float*)s; + dest[i] = *reinterpret_cast (s); #if JUCE_BIG_ENDIAN - uint32* const d = (uint32*) (dest + i); + auto d = reinterpret_cast (dest + i); *d = ByteOrder::swap (*d); #endif @@ -377,16 +377,16 @@ void AudioDataConverters::convertFloat32LEToFloat (const void* const source, flo } } -void AudioDataConverters::convertFloat32BEToFloat (const void* const source, float* const dest, int numSamples, const int srcBytesPerSample) +void AudioDataConverters::convertFloat32BEToFloat (const void* source, float* dest, int numSamples, int srcBytesPerSample) { - const char* s = static_cast (source); + auto s = static_cast (source); for (int i = 0; i < numSamples; ++i) { - dest[i] = *(float*)s; + dest[i] = *reinterpret_cast (s); #if JUCE_LITTLE_ENDIAN - uint32* const d = (uint32*) (dest + i); + auto d = reinterpret_cast (dest + i); *d = ByteOrder::swap (*d); #endif @@ -396,10 +396,7 @@ void AudioDataConverters::convertFloat32BEToFloat (const void* const source, flo //============================================================================== -void AudioDataConverters::convertFloatToFormat (const DataFormat destFormat, - const float* const source, - void* const dest, - const int numSamples) +void AudioDataConverters::convertFloatToFormat (DataFormat destFormat, const float* source, void* dest, int numSamples) { switch (destFormat) { @@ -415,10 +412,7 @@ void AudioDataConverters::convertFloatToFormat (const DataFormat destFormat, } } -void AudioDataConverters::convertFormatToFloat (const DataFormat sourceFormat, - const void* const source, - float* const dest, - const int numSamples) +void AudioDataConverters::convertFormatToFloat (DataFormat sourceFormat, const void* source, float* dest, int numSamples) { switch (sourceFormat) { @@ -435,15 +429,12 @@ void AudioDataConverters::convertFormatToFloat (const DataFormat sourceFormat, } //============================================================================== -void AudioDataConverters::interleaveSamples (const float** const source, - float* const dest, - const int numSamples, - const int numChannels) +void AudioDataConverters::interleaveSamples (const float** source, float* dest, int numSamples, int numChannels) { for (int chan = 0; chan < numChannels; ++chan) { - int i = chan; - const float* src = source [chan]; + auto i = chan; + auto src = source [chan]; for (int j = 0; j < numSamples; ++j) { @@ -453,15 +444,12 @@ void AudioDataConverters::interleaveSamples (const float** const source, } } -void AudioDataConverters::deinterleaveSamples (const float* const source, - float** const dest, - const int numSamples, - const int numChannels) +void AudioDataConverters::deinterleaveSamples (const float* source, float** dest, int numSamples, int numChannels) { for (int chan = 0; chan < numChannels; ++chan) { - int i = chan; - float* dst = dest [chan]; + auto i = chan; + auto dst = dest [chan]; for (int j = 0; j < numSamples; ++j) { @@ -491,8 +479,8 @@ public: static void test (UnitTest& unitTest, bool inPlace, Random& r) { - const int numSamples = 2048; - int32 original [numSamples], converted [numSamples], reversed [numSamples]; + constexpr int numSamples = 2048; + int32 original[numSamples], converted[numSamples], reversed[numSamples]; { AudioData::Pointer d (original); @@ -514,13 +502,13 @@ public: } // convert data from the source to dest format.. - std::unique_ptr conv (new AudioData::ConverterInstance , - AudioData::Pointer>()); + std::unique_ptr conv (new AudioData::ConverterInstance, + AudioData::Pointer>()); conv->convertSamples (inPlace ? reversed : converted, original, numSamples); // ..and back again.. - conv.reset (new AudioData::ConverterInstance , - AudioData::Pointer>()); + conv.reset (new AudioData::ConverterInstance, + AudioData::Pointer>()); if (! inPlace) zeromem (reversed, sizeof (reversed)); @@ -582,7 +570,7 @@ public: void runTest() override { - Random r = getRandom(); + auto r = getRandom(); beginTest ("Round-trip conversion: Int8"); Test1 ::test (*this, r); beginTest ("Round-trip conversion: Int16"); diff --git a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h index 231fdbab9f..b95262cd61 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h +++ b/modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h @@ -1080,7 +1080,7 @@ private: allocatedBytes = (size_t) numChannels * (size_t) size * sizeof (Type) + channelListSize + 32; allocatedData.malloc (allocatedBytes); channels = reinterpret_cast (allocatedData.get()); - auto* chan = (Type*) (allocatedData + channelListSize); + auto chan = reinterpret_cast (allocatedData + channelListSize); for (int i = 0; i < numChannels; ++i) { diff --git a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp index 4dc44c1b64..da999286ad 100644 --- a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp +++ b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp @@ -878,7 +878,7 @@ void JUCE_CALLTYPE FloatVectorOperations::convertFixedToFloat (float* dest, cons JUCE_LOAD_NONE, JUCE_INCREMENT_SRC_DEST, ) #else JUCE_PERFORM_VEC_OP_SRC_DEST (dest[i] = (float) src[i] * multiplier, - Mode::mul (mult, _mm_cvtepi32_ps (_mm_loadu_si128 ((const __m128i*) src))), + Mode::mul (mult, _mm_cvtepi32_ps (_mm_loadu_si128 (reinterpret_cast (src)))), JUCE_LOAD_NONE, JUCE_INCREMENT_SRC_DEST, const Mode::ParallelType mult = Mode::load1 (multiplier);) #endif diff --git a/modules/juce_audio_basics/mpe/juce_MPESynthesiser.h b/modules/juce_audio_basics/mpe/juce_MPESynthesiser.h index c49bbcdeb6..09c91645bb 100644 --- a/modules/juce_audio_basics/mpe/juce_MPESynthesiser.h +++ b/modules/juce_audio_basics/mpe/juce_MPESynthesiser.h @@ -72,7 +72,7 @@ public: MPESynthesiser (MPEInstrument* instrument); /** Destructor. */ - ~MPESynthesiser(); + ~MPESynthesiser() override; //============================================================================== /** Deletes all voices. */ diff --git a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h index bc6f5abe9d..44c755d313 100644 --- a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h @@ -66,7 +66,7 @@ public: The input source may be deleted depending on whether the deleteSourceWhenDeleted flag was set in the constructor. */ - ~BufferingAudioSource(); + ~BufferingAudioSource() override; //============================================================================== /** Implementation of the AudioSource method. */ diff --git a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h index f46093b2f1..69761fafa5 100644 --- a/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h @@ -56,7 +56,7 @@ public: bool deleteSourceWhenDeleted); /** Destructor. */ - ~ChannelRemappingAudioSource(); + ~ChannelRemappingAudioSource() override; //============================================================================== /** Specifies a number of channels that this audio source must produce from its diff --git a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h index 35030c069c..e47e9e814d 100644 --- a/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h @@ -43,7 +43,7 @@ public: bool deleteInputWhenDeleted); /** Destructor. */ - ~IIRFilterAudioSource(); + ~IIRFilterAudioSource() override; //============================================================================== /** Changes the filter to use the same parameters as the one being passed in. */ diff --git a/modules/juce_audio_basics/sources/juce_MixerAudioSource.h b/modules/juce_audio_basics/sources/juce_MixerAudioSource.h index 8b3e9c27e5..d3766f938f 100644 --- a/modules/juce_audio_basics/sources/juce_MixerAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_MixerAudioSource.h @@ -41,7 +41,7 @@ public: MixerAudioSource(); /** Destructor. */ - ~MixerAudioSource(); + ~MixerAudioSource() override; //============================================================================== /** Adds an input source to the mixer. diff --git a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h index 0ff3fae6b3..e33396b893 100644 --- a/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h @@ -47,7 +47,7 @@ public: int numChannels = 2); /** Destructor. */ - ~ResamplingAudioSource(); + ~ResamplingAudioSource() override; /** Changes the resampling ratio. diff --git a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h index 99fc422dbd..a22f4199ad 100644 --- a/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_ReverbAudioSource.h @@ -44,7 +44,7 @@ public: bool deleteInputWhenDeleted); /** Destructor. */ - ~ReverbAudioSource(); + ~ReverbAudioSource() override; //============================================================================== /** Returns the parameters from the reverb. */ diff --git a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h index ea1da6afa8..df04c89913 100644 --- a/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h @@ -38,7 +38,7 @@ public: ToneGeneratorAudioSource(); /** Destructor. */ - ~ToneGeneratorAudioSource(); + ~ToneGeneratorAudioSource() override; //============================================================================== /** Sets the signal's amplitude. */ diff --git a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp index ba6f818d6e..8c02bf246d 100644 --- a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp +++ b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp @@ -217,6 +217,18 @@ void Synthesiser::processNextBlock (AudioBuffer& outputAudio, template void Synthesiser::processNextBlock (AudioBuffer&, const MidiBuffer&, int, int); template void Synthesiser::processNextBlock (AudioBuffer&, const MidiBuffer&, int, int); +void Synthesiser::renderNextBlock (AudioBuffer& outputAudio, const MidiBuffer& inputMidi, + int startSample, int numSamples) +{ + processNextBlock (outputAudio, inputMidi, startSample, numSamples); +} + +void Synthesiser::renderNextBlock (AudioBuffer& outputAudio, const MidiBuffer& inputMidi, + int startSample, int numSamples) +{ + processNextBlock (outputAudio, inputMidi, startSample, numSamples); +} + void Synthesiser::renderVoices (AudioBuffer& buffer, int startSample, int numSamples) { for (auto* voice : voices) diff --git a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h index 62e8cc1a2e..b4a180db23 100644 --- a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h +++ b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.h @@ -525,21 +525,15 @@ public: both to the audio output buffer and the midi input buffer, so any midi events with timestamps outside the specified region will be ignored. */ - inline void renderNextBlock (AudioBuffer& outputAudio, - const MidiBuffer& inputMidi, - int startSample, - int numSamples) - { - processNextBlock (outputAudio, inputMidi, startSample, numSamples); - } + void renderNextBlock (AudioBuffer& outputAudio, + const MidiBuffer& inputMidi, + int startSample, + int numSamples); - inline void renderNextBlock (AudioBuffer& outputAudio, - const MidiBuffer& inputMidi, - int startSample, - int numSamples) - { - processNextBlock (outputAudio, inputMidi, startSample, numSamples); - } + void renderNextBlock (AudioBuffer& outputAudio, + const MidiBuffer& inputMidi, + int startSample, + int numSamples); /** Returns the current target sample rate at which rendering is being done. Subclasses may need to know this so that they can pitch things correctly. @@ -632,12 +626,6 @@ protected: private: //============================================================================== - template - void processNextBlock (AudioBuffer& outputAudio, - const MidiBuffer& inputMidi, - int startSample, - int numSamples); - //============================================================================== double sampleRate = 0; uint32 lastNoteOnCounter = 0; int minimumSubBlockSize = 32; @@ -645,6 +633,9 @@ private: bool shouldStealNotes = true; BigInteger sustainPedalsDown; + template + void processNextBlock (AudioBuffer&, const MidiBuffer&, int startSample, int numSamples); + #if JUCE_CATCH_DEPRECATED_CODE_MISUSE // Note the new parameters for these methods. virtual int findFreeVoice (const bool) const { return 0; } diff --git a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h index 346e118759..6692a1b3f8 100644 --- a/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h +++ b/modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h @@ -44,7 +44,7 @@ public: MidiMessageCollector(); /** Destructor. */ - ~MidiMessageCollector(); + ~MidiMessageCollector() override; //============================================================================== /** Clears any messages from the queue. diff --git a/modules/juce_audio_devices/midi_io/juce_MidiOutput.h b/modules/juce_audio_devices/midi_io/juce_MidiOutput.h index 63c1143be0..c41dde7061 100644 --- a/modules/juce_audio_devices/midi_io/juce_MidiOutput.h +++ b/modules/juce_audio_devices/midi_io/juce_MidiOutput.h @@ -81,7 +81,7 @@ public: //============================================================================== /** Destructor. */ - ~MidiOutput(); + ~MidiOutput() override; /** Returns the name of this device. */ const String& getName() const noexcept { return name; } diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp index 0857835dad..4a2634f62f 100644 --- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp +++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp @@ -181,7 +181,7 @@ public: AudioObjectAddPropertyListener (deviceID, &pa, deviceListenerProc, this); } - ~CoreAudioInternal() + ~CoreAudioInternal() override { AudioObjectPropertyAddress pa; pa.mSelector = kAudioObjectPropertySelectorWildcard; @@ -980,7 +980,7 @@ public: AudioObjectAddPropertyListener (kAudioObjectSystemObject, &pa, hardwareListenerProc, internal.get()); } - ~CoreAudioIODevice() + ~CoreAudioIODevice() override { close(); @@ -1217,7 +1217,7 @@ public: { } - ~AudioIODeviceCombiner() + ~AudioIODeviceCombiner() override { close(); devices.clear(); @@ -1806,7 +1806,7 @@ private: d->setDeviceWrapperRestartCallback ([this] { owner.restartAsync(); }); } - ~DeviceWrapper() + ~DeviceWrapper() override { close(); } @@ -2018,7 +2018,7 @@ public: AudioObjectAddPropertyListener (kAudioObjectSystemObject, &pa, hardwareListenerProc, this); } - ~CoreAudioIODeviceType() + ~CoreAudioIODeviceType() override { AudioObjectPropertyAddress pa; pa.mSelector = kAudioHardwarePropertyDevices; diff --git a/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h b/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h index 295447f97d..3f5a87d3f4 100644 --- a/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h +++ b/modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h @@ -45,7 +45,7 @@ public: Make sure this object isn't still being used by an AudioIODevice before deleting it! */ - virtual ~AudioSourcePlayer(); + ~AudioSourcePlayer() override; //============================================================================== /** Changes the current audio source to play from. diff --git a/modules/juce_audio_devices/sources/juce_AudioTransportSource.h b/modules/juce_audio_devices/sources/juce_AudioTransportSource.h index 5ac8dfa484..5e4c21237f 100644 --- a/modules/juce_audio_devices/sources/juce_AudioTransportSource.h +++ b/modules/juce_audio_devices/sources/juce_AudioTransportSource.h @@ -49,7 +49,7 @@ public: AudioTransportSource(); /** Destructor. */ - ~AudioTransportSource(); + ~AudioTransportSource() override; //============================================================================== /** Sets the reader that is being used as the input source. diff --git a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp index 6d43ce3b9b..b866b8aa45 100644 --- a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp @@ -651,7 +651,7 @@ public: writeHeader(); } - ~AiffAudioFormatWriter() + ~AiffAudioFormatWriter() override { if ((bytesWritten & 1) != 0) output->writeByte (0); diff --git a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.h b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.h index df37df89f6..2878611810 100644 --- a/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.h +++ b/modules/juce_audio_formats/codecs/juce_AiffAudioFormat.h @@ -43,7 +43,7 @@ public: AiffAudioFormat(); /** Destructor. */ - ~AiffAudioFormat(); + ~AiffAudioFormat() override; //============================================================================== /** Metadata property name used when reading a aiff file with a basc chunk. */ diff --git a/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp index a094132015..ce4f6375b9 100644 --- a/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp @@ -447,7 +447,7 @@ public: } } - ~CoreAudioReader() + ~CoreAudioReader() override { ExtAudioFileDispose (audioFileRef); AudioFileClose (audioFileID); diff --git a/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.h b/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.h index b0a286039f..c2ed22a74e 100644 --- a/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.h +++ b/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.h @@ -48,7 +48,7 @@ public: CoreAudioFormat(); /** Destructor. */ - ~CoreAudioFormat(); + ~CoreAudioFormat() override; //============================================================================== /** Metadata property name used when reading a caf file with a MIDI chunk. */ diff --git a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp index 8697855bbe..7d50373646 100644 --- a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp @@ -204,7 +204,7 @@ public: } } - ~FlacReader() + ~FlacReader() override { FlacNamespace::FLAC__stream_decoder_delete (decoder); } @@ -404,7 +404,7 @@ public: this) == FlacNamespace::FLAC__STREAM_ENCODER_INIT_STATUS_OK; } - ~FlacWriter() + ~FlacWriter() override { if (ok) { diff --git a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.h b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.h index 4cbca69cb4..bee5919b48 100644 --- a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.h +++ b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.h @@ -44,7 +44,7 @@ class JUCE_API FlacAudioFormat : public AudioFormat public: //============================================================================== FlacAudioFormat(); - ~FlacAudioFormat(); + ~FlacAudioFormat() override; //============================================================================== Array getPossibleSampleRates() override; diff --git a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp index 44ecd9a4c2..75bbd3b91a 100644 --- a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp @@ -149,7 +149,7 @@ public: } } - ~OggReader() + ~OggReader() override { ov_clear (&ovFile); } @@ -322,7 +322,7 @@ public: } } - ~OggWriter() + ~OggWriter() override { if (ok) { diff --git a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h index ffb4a815e4..2337f3c9c5 100644 --- a/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h +++ b/modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h @@ -44,7 +44,7 @@ class JUCE_API OggVorbisAudioFormat : public AudioFormat public: //============================================================================== OggVorbisAudioFormat(); - ~OggVorbisAudioFormat(); + ~OggVorbisAudioFormat() override; //============================================================================== Array getPossibleSampleRates() override; diff --git a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp index bd44388f72..6ca243b467 100644 --- a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp @@ -1319,7 +1319,7 @@ public: writeHeader(); } - ~WavAudioFormatWriter() + ~WavAudioFormatWriter() override { writeHeader(); } diff --git a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.h b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.h index 2273e8d7e7..9643cf3f33 100644 --- a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.h +++ b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.h @@ -43,7 +43,7 @@ public: WavAudioFormat(); /** Destructor. */ - ~WavAudioFormat(); + ~WavAudioFormat() override; //============================================================================== // BWAV chunk properties: diff --git a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c index 3ce1337e76..c6bd6f9f5e 100644 --- a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c +++ b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c @@ -1949,7 +1949,7 @@ long ov_read_filter(OggVorbis_File *vf,char *buffer,int length, vorbis_fpu_setround(&fpu); for(i=0;i (buffer))+i; for(j=0;j32767)val=32767; @@ -1965,7 +1965,7 @@ long ov_read_filter(OggVorbis_File *vf,char *buffer,int length, vorbis_fpu_setround(&fpu); for(i=0;i (buffer))+i; for(j=0;j32767)val=32767; diff --git a/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h b/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h index b548f3659a..20a831fda2 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h +++ b/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.h @@ -51,7 +51,7 @@ public: bool deleteReaderWhenThisIsDeleted); /** Destructor. */ - ~AudioFormatReaderSource(); + ~AudioFormatReaderSource() override; //============================================================================== /** Toggles loop-mode. diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp b/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp index 4234a4fee1..b8a726d96d 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp +++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp @@ -222,7 +222,7 @@ public: timeSliceThread.addTimeSliceClient (this); } - ~Buffer() + ~Buffer() override { isRunning = false; timeSliceThread.removeTimeSliceClient (this); diff --git a/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h b/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h index 71ade5f6c9..5e19731403 100644 --- a/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h +++ b/modules/juce_audio_formats/format/juce_AudioSubsectionReader.h @@ -63,7 +63,7 @@ public: bool deleteSourceWhenDeleted); /** Destructor. */ - ~AudioSubsectionReader(); + ~AudioSubsectionReader() override; //============================================================================== diff --git a/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h b/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h index 964a36b846..96c8bb5cb8 100644 --- a/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h +++ b/modules/juce_audio_formats/format/juce_BufferingAudioFormatReader.h @@ -54,7 +54,7 @@ public: TimeSliceThread& timeSliceThread, int samplesToBuffer); - ~BufferingAudioReader(); + ~BufferingAudioReader() override; /** Sets a number of milliseconds that the reader can block for in its readSamples() method before giving up and returning silence. diff --git a/modules/juce_audio_formats/sampler/juce_Sampler.h b/modules/juce_audio_formats/sampler/juce_Sampler.h index ce2a794f53..b29ad42e8e 100644 --- a/modules/juce_audio_formats/sampler/juce_Sampler.h +++ b/modules/juce_audio_formats/sampler/juce_Sampler.h @@ -72,7 +72,7 @@ public: double maxSampleLengthSeconds); /** Destructor. */ - ~SamplerSound(); + ~SamplerSound() override; //============================================================================== /** Returns the sample's name */ @@ -126,7 +126,7 @@ public: SamplerVoice(); /** Destructor. */ - ~SamplerVoice(); + ~SamplerVoice() override; //============================================================================== bool canPlaySound (SynthesiserSound*) override; diff --git a/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h b/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h index 6190aa2557..0eacdafcc5 100644 --- a/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h +++ b/modules/juce_audio_processors/processors/juce_AudioPluginInstance.h @@ -59,7 +59,7 @@ public: Make sure that you delete any UI components that belong to this plugin before deleting the plugin. */ - virtual ~AudioPluginInstance() {} + ~AudioPluginInstance() override {} //============================================================================== /** Fills-in the appropriate parts of this plugin description object. */ @@ -110,10 +110,10 @@ protected: struct Parameter : public AudioProcessorParameter { Parameter(); - virtual ~Parameter(); + ~Parameter() override; - virtual String getText (float value, int maximumStringLength) const override; - virtual float getValueForText (const String& text) const override; + String getText (float value, int maximumStringLength) const override; + float getValueForText (const String& text) const override; StringArray onStrings, offStrings; }; diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h index 603dc7f1ac..d7f9282f53 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h @@ -53,7 +53,7 @@ protected: public: /** Destructor. */ - ~AudioProcessorEditor(); + ~AudioProcessorEditor() override; //============================================================================== diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h index ff4337457e..8fca1d0ae5 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h @@ -55,7 +55,7 @@ public: /** Destructor. Any processor objects that have been added to the graph will also be deleted. */ - ~AudioProcessorGraph(); + ~AudioProcessorGraph() override; /** Each node in the graph has a UID of this type. */ struct NodeID @@ -322,7 +322,7 @@ public: //============================================================================== AudioGraphIOProcessor (IODeviceType); - ~AudioGraphIOProcessor(); + ~AudioGraphIOProcessor() override; const String getName() const override; void fillInPluginDescription (PluginDescription&) const override; diff --git a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp index 5f09e80062..2e13ee380c 100644 --- a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp +++ b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.cpp @@ -43,7 +43,7 @@ public: startTimer (100); } - virtual ~ParameterListener() + ~ParameterListener() override { if (LegacyAudioParameter::isLegacy (¶meter)) processor.removeListener (this); diff --git a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h index 78f4820200..90a1eda0c8 100644 --- a/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h +++ b/modules/juce_audio_processors/processors/juce_GenericAudioProcessorEditor.h @@ -44,7 +44,7 @@ class JUCE_API GenericAudioProcessorEditor : public AudioProcessorEditor public: //============================================================================== GenericAudioProcessorEditor (AudioProcessor* owner); - ~GenericAudioProcessorEditor(); + ~GenericAudioProcessorEditor() override; //============================================================================== void paint (Graphics&) override; diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp index 6d4602b1da..4f7e34baf3 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp +++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp @@ -379,7 +379,7 @@ public: } } - ~Scanner() + ~Scanner() override { if (pool != nullptr) { diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h index 53a228ff43..b4a61c59b6 100644 --- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h +++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h @@ -53,7 +53,7 @@ public: bool allowPluginsWhichRequireAsynchronousInstantiation = false); /** Destructor. */ - ~PluginListComponent(); + ~PluginListComponent() override; /** Changes the text in the panel's options button. */ void setOptionsButtonText (const String& newText); diff --git a/modules/juce_audio_processors/utilities/juce_AudioParameterBool.h b/modules/juce_audio_processors/utilities/juce_AudioParameterBool.h index 24f7176ed3..b20cf4f77e 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioParameterBool.h +++ b/modules/juce_audio_processors/utilities/juce_AudioParameterBool.h @@ -56,7 +56,7 @@ public: std::function boolFromString = nullptr); /** Destructor. */ - ~AudioParameterBool(); + ~AudioParameterBool() override; /** Returns the parameter's current boolean value. */ bool get() const noexcept { return value >= 0.5f; } diff --git a/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.h b/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.h index d584bb91fe..7599658b60 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.h +++ b/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.h @@ -60,7 +60,7 @@ public: std::function indexFromString = nullptr); /** Destructor. */ - ~AudioParameterChoice(); + ~AudioParameterChoice() override; /** Returns the current index of the selected item. */ int getIndex() const noexcept { return roundToInt (value); } diff --git a/modules/juce_audio_processors/utilities/juce_AudioParameterFloat.h b/modules/juce_audio_processors/utilities/juce_AudioParameterFloat.h index 28410c5d86..9ae2e83389 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioParameterFloat.h +++ b/modules/juce_audio_processors/utilities/juce_AudioParameterFloat.h @@ -74,7 +74,7 @@ public: float defaultValue); /** Destructor. */ - ~AudioParameterFloat(); + ~AudioParameterFloat() override; /** Returns the parameter's current value. */ float get() const noexcept { return value; } diff --git a/modules/juce_audio_processors/utilities/juce_AudioParameterInt.h b/modules/juce_audio_processors/utilities/juce_AudioParameterInt.h index 76d4dfa42d..75ad4958dd 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioParameterInt.h +++ b/modules/juce_audio_processors/utilities/juce_AudioParameterInt.h @@ -61,7 +61,7 @@ public: std::function intFromString = nullptr); /** Destructor. */ - ~AudioParameterInt(); + ~AudioParameterInt() override; /** Returns the parameter's current value as an integer. */ int get() const noexcept { return roundToInt (value); } diff --git a/modules/juce_audio_processors/utilities/juce_AudioProcessorParameterWithID.h b/modules/juce_audio_processors/utilities/juce_AudioProcessorParameterWithID.h index 2c3bd4456b..b63054f499 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioProcessorParameterWithID.h +++ b/modules/juce_audio_processors/utilities/juce_AudioProcessorParameterWithID.h @@ -46,7 +46,7 @@ public: Category category = AudioProcessorParameter::genericParameter); /** Destructor. */ - ~AudioProcessorParameterWithID(); + ~AudioProcessorParameterWithID() override; /** Provides access to the parameter's ID string. */ const String paramID; diff --git a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp index 487af6ba79..170dc256ff 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp +++ b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp @@ -80,7 +80,7 @@ public: parameter.addListener (this); } - ~ParameterAdapter() noexcept { parameter.removeListener (this); } + ~ParameterAdapter() override { parameter.removeListener (this); } void addListener (Listener* l) { listeners.add (l); } void removeListener (Listener* l) { listeners.remove (l); } @@ -586,7 +586,7 @@ struct AudioProcessorValueTreeState::SliderAttachment::Pimpl : private Attached slider.addListener (this); } - ~Pimpl() + ~Pimpl() override { slider.removeListener (this); removeListener(); @@ -638,7 +638,7 @@ struct AudioProcessorValueTreeState::ComboBoxAttachment::Pimpl : private Attach combo.addListener (this); } - ~Pimpl() + ~Pimpl() override { combo.removeListener (this); removeListener(); @@ -707,7 +707,7 @@ struct AudioProcessorValueTreeState::ButtonAttachment::Pimpl : private Attached button.addListener (this); } - ~Pimpl() + ~Pimpl() override { button.removeListener (this); removeListener(); diff --git a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h index 8b5913b33e..acc1dfb0ac 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h +++ b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h @@ -220,7 +220,7 @@ public: AudioProcessorValueTreeState (AudioProcessor& processorToConnectTo, UndoManager* undoManagerToUse); /** Destructor. */ - ~AudioProcessorValueTreeState(); + ~AudioProcessorValueTreeState() override; //============================================================================== /** This function is deprecated and will be removed in a future version of JUCE! diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp index 2cc3b19d41..24267c109d 100644 --- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp +++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp @@ -36,7 +36,7 @@ struct SimpleDeviceManagerInputLevelMeter : public Component, inputLevelGetter = manager.getInputLevelGetter(); } - ~SimpleDeviceManagerInputLevelMeter() + ~SimpleDeviceManagerInputLevelMeter() override { } @@ -218,7 +218,7 @@ public: setup.manager->addChangeListener (this); } - ~AudioDeviceSettingsPanel() + ~AudioDeviceSettingsPanel() override { setup.manager->removeChangeListener (this); } diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h index 8fb221de15..25ff141107 100644 --- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h +++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h @@ -73,7 +73,7 @@ public: bool hideAdvancedOptionsWithButton); /** Destructor */ - ~AudioDeviceSelectorComponent(); + ~AudioDeviceSelectorComponent() override; /** The device manager that this component is controlling */ AudioDeviceManager& deviceManager; diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp b/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp index 85bdca3d73..88892bb394 100644 --- a/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp +++ b/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp @@ -98,7 +98,7 @@ public: { } - ~LevelDataSource() + ~LevelDataSource() override { owner.cache.getTimeSliceThread().removeTimeSliceClient (this); } diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h index 50e1bcaa59..2496acb1d2 100644 --- a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h +++ b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h @@ -68,7 +68,7 @@ public: AudioThumbnailCache& cacheToUse); /** Destructor. */ - ~AudioThumbnail(); + ~AudioThumbnail() override; //============================================================================== /** Clears and resets the thumbnail. */ diff --git a/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h b/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h index d900314286..ca3a2c7cba 100644 --- a/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h +++ b/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h @@ -51,7 +51,7 @@ public: AudioVisualiserComponent (int initialNumChannels); /** Destructor. */ - ~AudioVisualiserComponent(); + ~AudioVisualiserComponent() override; /** Changes the number of channels that the visualiser stores. */ void setNumChannels (int numChannels); diff --git a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h index 95b599d8ab..3b75c7dfdd 100644 --- a/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h +++ b/modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h @@ -73,7 +73,7 @@ public: Orientation orientation); /** Destructor. */ - ~MidiKeyboardComponent(); + ~MidiKeyboardComponent() override; //============================================================================== /** Changes the velocity used in midi note-on messages that are triggered by clicking diff --git a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h index d0251aa0db..8349f82d4a 100644 --- a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h +++ b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h @@ -50,7 +50,7 @@ public: AudioProcessorPlayer (bool doDoublePrecisionProcessing = false); /** Destructor. */ - virtual ~AudioProcessorPlayer(); + ~AudioProcessorPlayer() override; //============================================================================== /** Sets the processor that should be played. diff --git a/modules/juce_audio_utils/players/juce_SoundPlayer.cpp b/modules/juce_audio_utils/players/juce_SoundPlayer.cpp index cbf6e924c1..9df3ff3b19 100644 --- a/modules/juce_audio_utils/players/juce_SoundPlayer.cpp +++ b/modules/juce_audio_utils/players/juce_SoundPlayer.cpp @@ -67,7 +67,7 @@ struct AutoRemovingTransportSource : public AudioTransportSource, startTimerHz (10); } - ~AutoRemovingTransportSource() + ~AutoRemovingTransportSource() override { setSource (nullptr); } diff --git a/modules/juce_audio_utils/players/juce_SoundPlayer.h b/modules/juce_audio_utils/players/juce_SoundPlayer.h index 205362b4a7..388f3b0272 100644 --- a/modules/juce_audio_utils/players/juce_SoundPlayer.h +++ b/modules/juce_audio_utils/players/juce_SoundPlayer.h @@ -36,14 +36,14 @@ namespace juce @tags{Audio} */ -class JUCE_API SoundPlayer : public AudioIODeviceCallback +class JUCE_API SoundPlayer : public AudioIODeviceCallback { public: //============================================================================== SoundPlayer(); /** Destructor. */ - virtual ~SoundPlayer(); + ~SoundPlayer() override; //============================================================================== /** Plays a sound from a file. */