diff --git a/3rdparty/soundtouch/CMakeLists.txt b/3rdparty/soundtouch/CMakeLists.txt index 5edcf65e2e..0c90e46496 100644 --- a/3rdparty/soundtouch/CMakeLists.txt +++ b/3rdparty/soundtouch/CMakeLists.txt @@ -1,5 +1,4 @@ add_library(pcsx2-soundtouch - source/SoundStretch/WavFile.cpp source/SoundTouch/AAFilter.cpp source/SoundTouch/BPMDetect.cpp source/SoundTouch/cpu_detect_x86.cpp @@ -19,7 +18,6 @@ add_library(pcsx2-soundtouch soundtouch/FIFOSamplePipe.h soundtouch/SoundTouch.h soundtouch/STTypes.h - source/SoundStretch/WavFile.h source/SoundTouch/AAFilter.h source/SoundTouch/cpu_detect.h source/SoundTouch/FIRFilter.h diff --git a/3rdparty/soundtouch/source/SoundTouch/InterpolateCubic.h b/3rdparty/soundtouch/source/SoundTouch/InterpolateCubic.h index d7e9db6498..0d4ea6c51e 100644 --- a/3rdparty/soundtouch/source/SoundTouch/InterpolateCubic.h +++ b/3rdparty/soundtouch/source/SoundTouch/InterpolateCubic.h @@ -38,7 +38,7 @@ namespace soundtouch { -class InterpolateCubic : public TransposerBase +class InterpolateCubic final : public TransposerBase { protected: virtual int transposeMono(SAMPLETYPE *dest, @@ -58,7 +58,7 @@ public: virtual void resetRegisters() override; - int getLatency() const + int getLatency() const override { return 1; } diff --git a/3rdparty/soundtouch/source/SoundTouch/InterpolateLinear.h b/3rdparty/soundtouch/source/SoundTouch/InterpolateLinear.h index c1aa8782f8..e43fda9321 100644 --- a/3rdparty/soundtouch/source/SoundTouch/InterpolateLinear.h +++ b/3rdparty/soundtouch/source/SoundTouch/InterpolateLinear.h @@ -39,7 +39,7 @@ namespace soundtouch { /// Linear transposer class that uses integer arithmetic -class InterpolateLinearInteger : public TransposerBase +class InterpolateLinearInteger final : public TransposerBase { protected: int iFract; @@ -69,23 +69,23 @@ public: /// Linear transposer class that uses floating point arithmetic -class InterpolateLinearFloat : public TransposerBase +class InterpolateLinearFloat final : public TransposerBase { protected: double fract; virtual int transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, - int &srcSamples); + int &srcSamples) override; virtual int transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, - int &srcSamples); - virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples); + int &srcSamples) override; + virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples) override; public: InterpolateLinearFloat(); - virtual void resetRegisters(); + void resetRegisters() override; int getLatency() const override { diff --git a/3rdparty/soundtouch/source/SoundTouch/InterpolateShannon.h b/3rdparty/soundtouch/source/SoundTouch/InterpolateShannon.h index 332059df42..40265db014 100644 --- a/3rdparty/soundtouch/source/SoundTouch/InterpolateShannon.h +++ b/3rdparty/soundtouch/source/SoundTouch/InterpolateShannon.h @@ -43,7 +43,7 @@ namespace soundtouch { -class InterpolateShannon : public TransposerBase +class InterpolateShannon final : public TransposerBase { protected: int transposeMono(SAMPLETYPE *dest, @@ -63,7 +63,7 @@ public: void resetRegisters() override; - int getLatency() const + int getLatency() const override { return 3; }