From 56586770e0d8d027ba2651fd24de9ac62984af3f Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 20 Aug 2016 18:10:36 -0400 Subject: [PATCH] EffectClientInterface::SetSampleRate takes double... ... All the overrides (except Ladspa) were casting it to floating poing anyway --- include/audacity/EffectInterface.h | 2 +- src/effects/Effect.cpp | 2 +- src/effects/Effect.h | 2 +- src/effects/VST/VSTEffect.cpp | 2 +- src/effects/VST/VSTEffect.h | 2 +- src/effects/audiounits/AudioUnitEffect.cpp | 2 +- src/effects/audiounits/AudioUnitEffect.h | 2 +- src/effects/ladspa/LadspaEffect.cpp | 2 +- src/effects/ladspa/LadspaEffect.h | 2 +- src/effects/lv2/LV2Effect.cpp | 2 +- src/effects/lv2/LV2Effect.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/audacity/EffectInterface.h b/include/audacity/EffectInterface.h index 15c1a5033..e2e85993c 100755 --- a/include/audacity/EffectInterface.h +++ b/include/audacity/EffectInterface.h @@ -123,7 +123,7 @@ public: virtual int GetMidiInCount() = 0; virtual int GetMidiOutCount() = 0; - virtual void SetSampleRate(sampleCount rate) = 0; + virtual void SetSampleRate(double rate) = 0; virtual sampleCount SetBlockSize(sampleCount maxBlockSize) = 0; virtual sampleCount GetLatency() = 0; diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 42653198a..50c23c9ca 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -325,7 +325,7 @@ int Effect::GetMidiOutCount() return 0; } -void Effect::SetSampleRate(sampleCount rate) +void Effect::SetSampleRate(double rate) { if (mClient) { diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 38a078e47..f8a10b5e1 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -106,7 +106,7 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler, sampleCount GetLatency() override; sampleCount GetTailSize() override; - void SetSampleRate(sampleCount rate) override; + void SetSampleRate(double rate) override; sampleCount SetBlockSize(sampleCount maxBlockSize) override; bool IsReady() override; diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 5fe36fb5c..1bcd78aa8 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -1332,7 +1332,7 @@ sampleCount VSTEffect::SetBlockSize(sampleCount maxBlockSize) return mBlockSize; } -void VSTEffect::SetSampleRate(sampleCount rate) +void VSTEffect::SetSampleRate(double rate) { mSampleRate = (float) rate; } diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h index 109cf99ad..7bcb344b6 100644 --- a/src/effects/VST/VSTEffect.h +++ b/src/effects/VST/VSTEffect.h @@ -108,7 +108,7 @@ class VSTEffect final : public wxEvtHandler, sampleCount GetLatency() override; sampleCount GetTailSize() override; - void SetSampleRate(sampleCount rate) override; + void SetSampleRate(double rate) override; sampleCount SetBlockSize(sampleCount maxBlockSize) override; bool IsReady() override; diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp index 170f94707..99b6c4d5b 100644 --- a/src/effects/audiounits/AudioUnitEffect.cpp +++ b/src/effects/audiounits/AudioUnitEffect.cpp @@ -1187,7 +1187,7 @@ int AudioUnitEffect::GetMidiOutCount() return 0; } -void AudioUnitEffect::SetSampleRate(sampleCount rate) +void AudioUnitEffect::SetSampleRate(double rate) { mSampleRate = rate; } diff --git a/src/effects/audiounits/AudioUnitEffect.h b/src/effects/audiounits/AudioUnitEffect.h index de311fbec..44c5daeb6 100644 --- a/src/effects/audiounits/AudioUnitEffect.h +++ b/src/effects/audiounits/AudioUnitEffect.h @@ -78,7 +78,7 @@ public: int GetMidiInCount() override; int GetMidiOutCount() override; - void SetSampleRate(sampleCount rate) override; + void SetSampleRate(double rate) override; sampleCount SetBlockSize(sampleCount maxBlockSize) override; sampleCount GetLatency() override; diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp index 91a7927c6..21bb485b3 100644 --- a/src/effects/ladspa/LadspaEffect.cpp +++ b/src/effects/ladspa/LadspaEffect.cpp @@ -886,7 +886,7 @@ int LadspaEffect::GetMidiOutCount() return 0; } -void LadspaEffect::SetSampleRate(sampleCount rate) +void LadspaEffect::SetSampleRate(double rate) { mSampleRate = rate; } diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h index fd867d107..c8bb75dbc 100644 --- a/src/effects/ladspa/LadspaEffect.h +++ b/src/effects/ladspa/LadspaEffect.h @@ -73,7 +73,7 @@ public: int GetMidiInCount() override; int GetMidiOutCount() override; - void SetSampleRate(sampleCount rate) override; + void SetSampleRate(double rate) override; sampleCount SetBlockSize(sampleCount maxBlockSize) override; sampleCount GetLatency() override; diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index 64bd0561f..336d5265d 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -722,7 +722,7 @@ int LV2Effect::GetMidiOutCount() return 0; } -void LV2Effect::SetSampleRate(sampleCount rate) +void LV2Effect::SetSampleRate(double rate) { mSampleRate = (double) rate; diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index 9b122f1a1..100230979 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -128,7 +128,7 @@ public: int GetMidiInCount() override; int GetMidiOutCount() override; - void SetSampleRate(sampleCount rate) override; + void SetSampleRate(double rate) override; sampleCount SetBlockSize(sampleCount maxBlockSize) override; sampleCount GetLatency() override;