From 0ad533a740ef4fbffb4dd6d39579aef7f2b919a0 Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 21 Feb 2018 14:24:25 +0000 Subject: [PATCH] Automation -> Scripting. --- include/audacity/EffectAutomationParameters.h | 14 +++++++------- include/audacity/EffectInterface.h | 4 ++-- src/Menus.cpp | 2 +- src/Shuttle.h | 8 ++++---- src/commands/AudacityCommand.cpp | 4 ++-- src/commands/DragCommand.h | 2 +- src/commands/GetInfoCommand.cpp | 2 +- src/commands/GetInfoCommand.h | 2 +- src/effects/Amplify.cpp | 4 ++-- src/effects/Amplify.h | 4 ++-- src/effects/AutoDuck.cpp | 4 ++-- src/effects/AutoDuck.h | 4 ++-- src/effects/BassTreble.cpp | 4 ++-- src/effects/BassTreble.h | 4 ++-- src/effects/ChangePitch.cpp | 4 ++-- src/effects/ChangePitch.h | 4 ++-- src/effects/ChangeSpeed.cpp | 4 ++-- src/effects/ChangeSpeed.h | 4 ++-- src/effects/ChangeTempo.cpp | 4 ++-- src/effects/ChangeTempo.h | 4 ++-- src/effects/ClickRemoval.cpp | 4 ++-- src/effects/ClickRemoval.h | 4 ++-- src/effects/Compressor.cpp | 4 ++-- src/effects/Compressor.h | 4 ++-- src/effects/Distortion.cpp | 4 ++-- src/effects/Distortion.h | 4 ++-- src/effects/DtmfGen.cpp | 4 ++-- src/effects/DtmfGen.h | 4 ++-- src/effects/Echo.cpp | 4 ++-- src/effects/Echo.h | 4 ++-- src/effects/Effect.cpp | 8 ++++---- src/effects/Effect.h | 4 ++-- src/effects/EffectManager.cpp | 8 ++++---- src/effects/Equalization.cpp | 4 ++-- src/effects/Equalization.h | 4 ++-- src/effects/FindClipping.cpp | 4 ++-- src/effects/FindClipping.h | 4 ++-- src/effects/Noise.cpp | 4 ++-- src/effects/Noise.h | 4 ++-- src/effects/Normalize.cpp | 4 ++-- src/effects/Normalize.h | 4 ++-- src/effects/Paulstretch.cpp | 4 ++-- src/effects/Paulstretch.h | 4 ++-- src/effects/Phaser.cpp | 4 ++-- src/effects/Phaser.h | 4 ++-- src/effects/Repeat.cpp | 4 ++-- src/effects/Repeat.h | 4 ++-- src/effects/Reverb.cpp | 4 ++-- src/effects/Reverb.h | 4 ++-- src/effects/ScienFilter.cpp | 4 ++-- src/effects/ScienFilter.h | 4 ++-- src/effects/TimeScale.cpp | 4 ++-- src/effects/TimeScale.h | 4 ++-- src/effects/ToneGen.cpp | 4 ++-- src/effects/ToneGen.h | 4 ++-- src/effects/TruncSilence.cpp | 4 ++-- src/effects/TruncSilence.h | 4 ++-- src/effects/VST/VSTEffect.cpp | 8 ++++---- src/effects/VST/VSTEffect.h | 4 ++-- src/effects/Wahwah.cpp | 4 ++-- src/effects/Wahwah.h | 4 ++-- src/effects/audiounits/AudioUnitEffect.cpp | 8 ++++---- src/effects/audiounits/AudioUnitEffect.h | 4 ++-- src/effects/ladspa/LadspaEffect.cpp | 8 ++++---- src/effects/ladspa/LadspaEffect.h | 4 ++-- src/effects/lv2/LV2Effect.cpp | 8 ++++---- src/effects/lv2/LV2Effect.h | 4 ++-- src/effects/nyquist/Nyquist.cpp | 4 ++-- src/effects/nyquist/Nyquist.h | 4 ++-- src/effects/vamp/VampEffect.cpp | 4 ++-- src/effects/vamp/VampEffect.h | 4 ++-- 71 files changed, 157 insertions(+), 157 deletions(-) diff --git a/include/audacity/EffectAutomationParameters.h b/include/audacity/EffectAutomationParameters.h index 1b95cb1d6..7eeb83596 100644 --- a/include/audacity/EffectAutomationParameters.h +++ b/include/audacity/EffectAutomationParameters.h @@ -3,7 +3,7 @@ Audacity: A Digital Audio Editor EffectAutomationParameters.h - (defining CommandAutomationParameters) + (defining CommandParameters) Leland Lucius @@ -40,8 +40,8 @@ **********************************************************************/ -#ifndef __AUDACITY_COMMAND_AUTOMATION_PARAMETERS_H__ -#define __AUDACITY_COMMAND_AUTOMATION_PARAMETERS_H__ +#ifndef __AUDACITY_COMMAND_PARAMETERS_H__ +#define __AUDACITY_COMMAND_PARAMETERS_H__ #include @@ -51,7 +51,7 @@ /** -\brief CommandAutomationParameters, derived from wxFileConfig, is essentially doing +\brief CommandParameters, derived from wxFileConfig, is essentially doing the same things as the Shuttle classes. It does text <-> binary conversions of parameters. It does not seem to be using actual file read/writing. @@ -61,10 +61,10 @@ wxWidget validators, and can create default dialogs. However until that convers done, we need this class, and we use a pointer to one from within a Shuttle when interfacing with the code that still uses it. */ -class CommandAutomationParameters final : public wxFileConfig +class CommandParameters final : public wxFileConfig { public: - CommandAutomationParameters(const wxString & parms = wxEmptyString) + CommandParameters(const wxString & parms = wxEmptyString) : wxFileConfig(wxEmptyString, wxEmptyString, wxEmptyString, @@ -74,7 +74,7 @@ public: SetParameters(parms); } - virtual ~CommandAutomationParameters() + virtual ~CommandParameters() { } diff --git a/include/audacity/EffectInterface.h b/include/audacity/EffectInterface.h index 355bd2467..fc37883bf 100755 --- a/include/audacity/EffectInterface.h +++ b/include/audacity/EffectInterface.h @@ -214,8 +214,8 @@ public: // should derive by some route from AudacityCommand to pick up that // functionality. //virtual bool DefineParams( ShuttleParams & S){ return false;}; - virtual bool GetAutomationParameters(CommandAutomationParameters & parms) = 0; - virtual bool SetAutomationParameters(CommandAutomationParameters & parms) = 0; + virtual bool GetAutomationParameters(CommandParameters & parms) = 0; + virtual bool SetAutomationParameters(CommandParameters & parms) = 0; virtual bool LoadUserPreset(const wxString & name) = 0; virtual bool SaveUserPreset(const wxString & name) = 0; diff --git a/src/Menus.cpp b/src/Menus.cpp index 0bed2ead7..32f0a1071 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -1588,7 +1588,7 @@ void AudacityProject::CreateMenusAndCommands() // Effects Manager also (now) manages Generic commands. // plug-in manager, as if an effect. - c->BeginSubMenu(_("&Automation")); + c->BeginSubMenu(_("&Scriptables")); // Note that the PLUGIN_SYMBOL must have a space between words, // whereas the short-form used here must not. diff --git a/src/Shuttle.h b/src/Shuttle.h index 7e3f517e2..2d43551d9 100644 --- a/src/Shuttle.h +++ b/src/Shuttle.h @@ -58,7 +58,7 @@ public: bool ExchangeWithMaster(const wxString & Name) override; }; -class CommandAutomationParameters; +class CommandParameters; /**************************************************************************//** \brief Shuttle that deals with parameters. This is a base class with lots of virtual functions that do nothing by default. @@ -68,7 +68,7 @@ class ShuttleParams : public Shuttle public: wxString mParams; bool *pOptionalFlag; - CommandAutomationParameters * mpEap; + CommandParameters * mpEap; ShuttleParams(){ mParams = wxT("") ;mpEap=NULL;pOptionalFlag=NULL;} virtual ~ShuttleParams() {} bool ExchangeWithMaster(const wxString & Name) override; @@ -116,8 +116,8 @@ public: bool bWrite; ShuttleParams & Optional( bool & var ) override; bool CouldGet(const wxString &key); - void SetForValidating( CommandAutomationParameters * pEap){ mpEap=pEap; bOK=true;bWrite=false;}; - void SetForWriting(CommandAutomationParameters * pEap){ mpEap=pEap;bOK=true;bWrite=true;}; + void SetForValidating( CommandParameters * pEap){ mpEap=pEap; bOK=true;bWrite=false;}; + void SetForWriting(CommandParameters * pEap){ mpEap=pEap;bOK=true;bWrite=true;}; void Define( bool & var, const wxChar * key, const bool vdefault, const bool vmin, const bool vmax, const bool vscl ) override; void Define( int & var, const wxChar * key, const int vdefault, const int vmin, const int vmax, const int vscl ) override; void Define( size_t & var, const wxChar * key, const int vdefault, const int vmin, const int vmax, const int vscl ) override; diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp index 2ed153104..95847fd1d 100644 --- a/src/commands/AudacityCommand.cpp +++ b/src/commands/AudacityCommand.cpp @@ -144,7 +144,7 @@ wxDialog *AudacityCommand::CreateUI(wxWindow *parent, AudacityCommand * WXUNUSED bool AudacityCommand::GetAutomationParameters(wxString & parms) { - CommandAutomationParameters eap; + CommandParameters eap; if (mUIDialog && !TransferDataFromWindow()) { @@ -163,7 +163,7 @@ bool AudacityCommand::SetAutomationParameters(const wxString & parms) { wxString preset = parms; - CommandAutomationParameters eap(parms); + CommandParameters eap(parms); ShuttleSetAutomation S; S.SetForWriting( &eap ); diff --git a/src/commands/DragCommand.h b/src/commands/DragCommand.h index 934bd4c29..2895b0539 100644 --- a/src/commands/DragCommand.h +++ b/src/commands/DragCommand.h @@ -32,7 +32,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Automation#drag");}; + wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables#drag");}; bool Apply(const CommandContext & context) override; diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp index efe6525bc..1a3206f8d 100644 --- a/src/commands/GetInfoCommand.cpp +++ b/src/commands/GetInfoCommand.cpp @@ -433,7 +433,7 @@ void GetInfoCommand::ExploreMenu( const CommandContext &context, wxMenu * pMenu, context.AddItem( Label, "2" ); context.AddItem( Accel, "3" ); if( !Name.IsEmpty() ) - context.AddItem( Name, "id" );// It is called Automation ID outside Audacity. + context.AddItem( Name, "id" );// It is called Scripting ID outside Audacity. context.EndStruct(); if (item->IsSubMenu()) { diff --git a/src/commands/GetInfoCommand.h b/src/commands/GetInfoCommand.h index 9d973feef..2eb0c696f 100644 --- a/src/commands/GetInfoCommand.h +++ b/src/commands/GetInfoCommand.h @@ -38,7 +38,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Automation");}; + wxString ManualPage() override {return wxT("Scriptables");}; bool Apply(const CommandContext &context) override; bool ApplyInner(const CommandContext &context); diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp index 0f46eb114..314b06391 100644 --- a/src/effects/Amplify.cpp +++ b/src/effects/Amplify.cpp @@ -128,14 +128,14 @@ bool EffectAmplify::DefineParams( ShuttleParams & S ){ return true; } -bool EffectAmplify::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectAmplify::GetAutomationParameters(CommandParameters & parms) { parms.WriteFloat(KEY_Ratio, mRatio); return true; } -bool EffectAmplify::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectAmplify::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyFloat(Ratio); diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h index 78ac836bd..a12967fd9 100644 --- a/src/effects/Amplify.h +++ b/src/effects/Amplify.h @@ -49,8 +49,8 @@ public: unsigned GetAudioOutCount() override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadFactoryDefaults() override; // Effect implementation diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index 4f14e2606..99eaf39dd 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -136,7 +136,7 @@ bool EffectAutoDuck::DefineParams( ShuttleParams & S ){ return true; } -bool EffectAutoDuck::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectAutoDuck::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_DuckAmountDb, mDuckAmountDb); parms.Write(KEY_InnerFadeDownLen, mInnerFadeDownLen); @@ -149,7 +149,7 @@ bool EffectAutoDuck::GetAutomationParameters(CommandAutomationParameters & parms return true; } -bool EffectAutoDuck::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectAutoDuck::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(DuckAmountDb); ReadAndVerifyDouble(InnerFadeDownLen); diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index 8f0c318af..357b31225 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -47,8 +47,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index 901eee34c..ecfaa0371 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -177,7 +177,7 @@ bool EffectBassTreble::DefineParams( ShuttleParams & S ){ return true; } -bool EffectBassTreble::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectBassTreble::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Bass, mBass); parms.Write(KEY_Treble, mTreble); @@ -187,7 +187,7 @@ bool EffectBassTreble::GetAutomationParameters(CommandAutomationParameters & par return true; } -bool EffectBassTreble::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectBassTreble::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(Bass); ReadAndVerifyDouble(Treble); diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h index 47d886e70..6fc41f523 100644 --- a/src/effects/BassTreble.h +++ b/src/effects/BassTreble.h @@ -70,8 +70,8 @@ public: float **outbuf, size_t numSamples) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect Implementation diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp index 0ea2456c4..94251bce5 100644 --- a/src/effects/ChangePitch.cpp +++ b/src/effects/ChangePitch.cpp @@ -144,7 +144,7 @@ bool EffectChangePitch::DefineParams( ShuttleParams & S ){ return true; } -bool EffectChangePitch::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectChangePitch::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Percentage, m_dPercentChange); parms.Write(KEY_UseSBSMS, mUseSBSMS); @@ -152,7 +152,7 @@ bool EffectChangePitch::GetAutomationParameters(CommandAutomationParameters & pa return true; } -bool EffectChangePitch::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectChangePitch::SetAutomationParameters(CommandParameters & parms) { // Vaughan, 2013-06: Long lost to history, I don't see why m_dPercentChange was chosen to be shuttled. // Only m_dSemitonesChange is used in Process(). diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 1b32ba6da..69e736bf3 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -57,8 +57,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadFactoryDefaults() override; // Effect implementation diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index e81aac8f6..d9e44645b 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -134,14 +134,14 @@ bool EffectChangeSpeed::DefineParams( ShuttleParams & S ){ return true; } -bool EffectChangeSpeed::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectChangeSpeed::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Percentage, m_PercentChange); return true; } -bool EffectChangeSpeed::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectChangeSpeed::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(Percentage); diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index d029e910b..86811176a 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -46,8 +46,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadFactoryDefaults() override; // Effect implementation diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp index a0507b748..9f8959191 100644 --- a/src/effects/ChangeTempo.cpp +++ b/src/effects/ChangeTempo.cpp @@ -126,7 +126,7 @@ bool EffectChangeTempo::DefineParams( ShuttleParams & S ){ return true; } -bool EffectChangeTempo::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectChangeTempo::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Percentage, m_PercentChange); parms.Write(KEY_UseSBSMS, mUseSBSMS); @@ -134,7 +134,7 @@ bool EffectChangeTempo::GetAutomationParameters(CommandAutomationParameters & pa return true; } -bool EffectChangeTempo::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectChangeTempo::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(Percentage); m_PercentChange = Percentage; diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index a48ade3bb..0a5a92304 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -52,8 +52,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 44b78cc8a..f44d8a86e 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -104,7 +104,7 @@ bool EffectClickRemoval::DefineParams( ShuttleParams & S ){ return true; } -bool EffectClickRemoval::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectClickRemoval::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Threshold, mThresholdLevel); parms.Write(KEY_Width, mClickWidth); @@ -112,7 +112,7 @@ bool EffectClickRemoval::GetAutomationParameters(CommandAutomationParameters & p return true; } -bool EffectClickRemoval::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectClickRemoval::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyInt(Threshold); ReadAndVerifyInt(Width); diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h index ef576cf3f..b160e13d9 100644 --- a/src/effects/ClickRemoval.h +++ b/src/effects/ClickRemoval.h @@ -47,8 +47,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index 48fe19f01..dbf78fd26 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -130,7 +130,7 @@ bool EffectCompressor::DefineParams( ShuttleParams & S ){ return true; } -bool EffectCompressor::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectCompressor::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Threshold, mThresholdDB); parms.Write(KEY_NoiseFloor, mNoiseFloorDB); @@ -143,7 +143,7 @@ bool EffectCompressor::GetAutomationParameters(CommandAutomationParameters & par return true; } -bool EffectCompressor::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectCompressor::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(Threshold); ReadAndVerifyDouble(NoiseFloor); diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index 369f128d5..16c00027d 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -49,8 +49,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index 679853b24..1e7a6fd7b 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -291,7 +291,7 @@ bool EffectDistortion::DefineParams( ShuttleParams & S ){ return true; } -bool EffectDistortion::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectDistortion::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_TableTypeIndx, kTableTypeStrings[mParams.mTableChoiceIndx]); parms.Write(KEY_DCBlock, mParams.mDCBlock); @@ -304,7 +304,7 @@ bool EffectDistortion::GetAutomationParameters(CommandAutomationParameters & par return true; } -bool EffectDistortion::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectDistortion::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyEnum(TableTypeIndx, wxArrayString(nTableTypes, kTableTypeStrings)); ReadAndVerifyBool(DCBlock); diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h index 3261de991..752c37d87 100644 --- a/src/effects/Distortion.h +++ b/src/effects/Distortion.h @@ -87,8 +87,8 @@ public: float **outbuf, size_t numSamples) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; wxArrayString GetFactoryPresets() override; bool LoadFactoryPreset(int id) override; diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index cddfe6489..9953232a6 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -236,7 +236,7 @@ bool EffectDtmf::DefineParams( ShuttleParams & S ){ return true; } -bool EffectDtmf::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectDtmf::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Sequence, dtmfSequence); parms.Write(KEY_DutyCycle, dtmfDutyCycle); @@ -245,7 +245,7 @@ bool EffectDtmf::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool EffectDtmf::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectDtmf::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(DutyCycle); ReadAndVerifyDouble(Amplitude); diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h index 02da03a6c..86ea6aa0c 100644 --- a/src/effects/DtmfGen.h +++ b/src/effects/DtmfGen.h @@ -49,8 +49,8 @@ public: bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index de15a62cf..0daa8ea11 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -143,7 +143,7 @@ bool EffectEcho::DefineParams( ShuttleParams & S ){ } -bool EffectEcho::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectEcho::GetAutomationParameters(CommandParameters & parms) { parms.WriteFloat(KEY_Delay, delay); parms.WriteFloat(KEY_Decay, decay); @@ -151,7 +151,7 @@ bool EffectEcho::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool EffectEcho::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectEcho::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyFloat(Delay); ReadAndVerifyFloat(Decay); diff --git a/src/effects/Echo.h b/src/effects/Echo.h index 8a7fdd0ae..18f08a178 100644 --- a/src/effects/Echo.h +++ b/src/effects/Echo.h @@ -47,8 +47,8 @@ public: bool ProcessFinalize() override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index ac3b4cbd6..7e4b55165 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -589,7 +589,7 @@ bool Effect::ShowInterface(wxWindow *parent, bool forceModal) return res; } -bool Effect::GetAutomationParameters(CommandAutomationParameters & parms) +bool Effect::GetAutomationParameters(CommandParameters & parms) { if (mClient) { @@ -599,7 +599,7 @@ bool Effect::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool Effect::SetAutomationParameters(CommandAutomationParameters & parms) +bool Effect::SetAutomationParameters(CommandParameters & parms) { if (mClient) { @@ -1029,7 +1029,7 @@ bool Effect::Startup() bool Effect::GetAutomationParameters(wxString & parms) { - CommandAutomationParameters eap; + CommandParameters eap; if (mUIDialog && !TransferDataFromWindow()) { @@ -1077,7 +1077,7 @@ bool Effect::SetAutomationParameters(const wxString & parms) } else { - CommandAutomationParameters eap(parms); + CommandParameters eap(parms); ShuttleSetAutomation S; S.SetForValidating( &eap ); // DefineParams returns false if not defined for this effect. diff --git a/src/effects/Effect.h b/src/effects/Effect.h index fc9fc7c9a..f6b7dee1c 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -135,8 +135,8 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler, bool ShowInterface(wxWindow *parent, bool forceModal = false) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadUserPreset(const wxString & name) override; bool SaveUserPreset(const wxString & name) override; diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index b703b5bf0..fa4cc9729 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -336,7 +336,7 @@ bool EffectManager::SetEffectParameters(const PluginID & ID, const wxString & pa if (effect) { - CommandAutomationParameters eap(params); + CommandParameters eap(params); if (eap.HasEntry(wxT("Use Preset"))) { @@ -351,7 +351,7 @@ bool EffectManager::SetEffectParameters(const PluginID & ID, const wxString & pa { // Set defaults (if not initialised) before setting values. command->Init(); - CommandAutomationParameters eap(params); + CommandParameters eap(params); if (eap.HasEntry(wxT("Use Preset"))) { @@ -409,7 +409,7 @@ wxString EffectManager::GetPreset(const PluginID & ID, const wxString & params, return wxEmptyString; } - CommandAutomationParameters eap(params); + CommandParameters eap(params); wxString preset; if (eap.HasEntry(wxT("Use Preset"))) @@ -452,7 +452,7 @@ wxString EffectManager::GetDefaultPreset(const PluginID & ID) if (!preset.IsEmpty()) { - CommandAutomationParameters eap; + CommandParameters eap; eap.Write(wxT("Use Preset"), preset); eap.GetParameters(preset); diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index fec248b5d..180749179 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -318,7 +318,7 @@ bool EffectEqualization::DefineParams( ShuttleParams & S ){ return true; } -bool EffectEqualization::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectEqualization::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_FilterLength, (unsigned long)mM); parms.Write(KEY_CurveName, mCurveName); @@ -328,7 +328,7 @@ bool EffectEqualization::GetAutomationParameters(CommandAutomationParameters & p return true; } -bool EffectEqualization::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectEqualization::SetAutomationParameters(CommandParameters & parms) { // Pretty sure the interpolation name shouldn't have been interpreted when // specified in chains, but must keep it that way for compatibility. diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index ea8d2256b..addb4e3ed 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -115,8 +115,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadFactoryDefaults() override; // EffectUIClientInterface implementation diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index 617898bf5..b5e8b4efd 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -81,7 +81,7 @@ bool EffectFindClipping::DefineParams( ShuttleParams & S ){ return true; } -bool EffectFindClipping::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectFindClipping::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Start, mStart); parms.Write(KEY_Stop, mStop); @@ -89,7 +89,7 @@ bool EffectFindClipping::GetAutomationParameters(CommandAutomationParameters & p return true; } -bool EffectFindClipping::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectFindClipping::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyInt(Start); ReadAndVerifyInt(Stop); diff --git a/src/effects/FindClipping.h b/src/effects/FindClipping.h index 3168e2c90..c9af30ecc 100644 --- a/src/effects/FindClipping.h +++ b/src/effects/FindClipping.h @@ -41,8 +41,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index b91ade8de..57676ced6 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -168,7 +168,7 @@ bool EffectNoise::DefineParams( ShuttleParams & S ){ return true; } -bool EffectNoise::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectNoise::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Type, kTypeStrings[mType]); parms.Write(KEY_Amp, mAmp); @@ -176,7 +176,7 @@ bool EffectNoise::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool EffectNoise::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectNoise::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyEnum(Type, wxArrayString(nTypes, kTypeStrings)); ReadAndVerifyDouble(Amp); diff --git a/src/effects/Noise.h b/src/effects/Noise.h index 383c9c0c1..495cf8561 100644 --- a/src/effects/Noise.h +++ b/src/effects/Noise.h @@ -44,8 +44,8 @@ public: unsigned GetAudioOutCount() override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index ac6011ce9..0c7ef6550 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -89,7 +89,7 @@ bool EffectNormalize::DefineParams( ShuttleParams & S ){ return true; } -bool EffectNormalize::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectNormalize::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Level, mLevel); parms.Write(KEY_ApplyGain, mGain); @@ -99,7 +99,7 @@ bool EffectNormalize::GetAutomationParameters(CommandAutomationParameters & parm return true; } -bool EffectNormalize::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectNormalize::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(Level); ReadAndVerifyBool(ApplyGain); diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h index a562685ba..c681b10f7 100644 --- a/src/effects/Normalize.h +++ b/src/effects/Normalize.h @@ -43,8 +43,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index cbcd438ed..7b5ca5851 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -127,7 +127,7 @@ bool EffectPaulstretch::DefineParams( ShuttleParams & S ){ return true; } -bool EffectPaulstretch::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectPaulstretch::GetAutomationParameters(CommandParameters & parms) { parms.WriteFloat(KEY_Amount, mAmount); parms.WriteFloat(KEY_Time, mTime_resolution); @@ -135,7 +135,7 @@ bool EffectPaulstretch::GetAutomationParameters(CommandAutomationParameters & pa return true; } -bool EffectPaulstretch::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectPaulstretch::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyFloat(Amount); ReadAndVerifyFloat(Time); diff --git a/src/effects/Paulstretch.h b/src/effects/Paulstretch.h index 772ff36bb..cb895183c 100644 --- a/src/effects/Paulstretch.h +++ b/src/effects/Paulstretch.h @@ -37,8 +37,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index 5526b32ab..2b8c9daa9 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -204,7 +204,7 @@ bool EffectPhaser::DefineParams( ShuttleParams & S ){ return true; } -bool EffectPhaser::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectPhaser::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Stages, mStages); parms.Write(KEY_DryWet, mDryWet); @@ -217,7 +217,7 @@ bool EffectPhaser::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool EffectPhaser::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectPhaser::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyInt(Stages); ReadAndVerifyInt(DryWet); diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h index ba6246f20..8e3f090ab 100644 --- a/src/effects/Phaser.h +++ b/src/effects/Phaser.h @@ -75,8 +75,8 @@ public: float **outbuf, size_t numSamples) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp index 11fd9b42c..4eb4526df 100644 --- a/src/effects/Repeat.cpp +++ b/src/effects/Repeat.cpp @@ -85,14 +85,14 @@ bool EffectRepeat::DefineParams( ShuttleParams & S ){ return true; } -bool EffectRepeat::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectRepeat::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Count, repeatCount); return true; } -bool EffectRepeat::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectRepeat::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyInt(Count); diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h index 98b575401..dd04732ce 100644 --- a/src/effects/Repeat.h +++ b/src/effects/Repeat.h @@ -41,8 +41,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index 5eb3195f0..78c661c12 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -283,7 +283,7 @@ bool EffectReverb::DefineParams( ShuttleParams & S ){ return true; } -bool EffectReverb::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectReverb::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_RoomSize, mParams.mRoomSize); parms.Write(KEY_PreDelay, mParams.mPreDelay); @@ -299,7 +299,7 @@ bool EffectReverb::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool EffectReverb::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectReverb::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(RoomSize); ReadAndVerifyDouble(PreDelay); diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h index 04d6e6ca3..b91c05c98 100644 --- a/src/effects/Reverb.h +++ b/src/effects/Reverb.h @@ -64,8 +64,8 @@ public: bool ProcessFinalize() override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; wxArrayString GetFactoryPresets() override; bool LoadFactoryPreset(int id) override; diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index c8dc12bd0..2b09d5c47 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -252,7 +252,7 @@ bool EffectScienFilter::DefineParams( ShuttleParams & S ){ return true; } -bool EffectScienFilter::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectScienFilter::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Type, kTypeStrings[mFilterType]); parms.Write(KEY_Subtype, kSubTypeStrings[mFilterSubtype]); @@ -264,7 +264,7 @@ bool EffectScienFilter::GetAutomationParameters(CommandAutomationParameters & pa return true; } -bool EffectScienFilter::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectScienFilter::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyEnum(Type, wxArrayString(nTypes, kTypeStrings)); ReadAndVerifyEnum(Subtype, wxArrayString(nSubTypes, kSubTypeStrings)); diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h index c8ee238fc..d5f20afbe 100644 --- a/src/effects/ScienFilter.h +++ b/src/effects/ScienFilter.h @@ -58,8 +58,8 @@ public: bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp index 0e84f70c1..829936b93 100644 --- a/src/effects/TimeScale.cpp +++ b/src/effects/TimeScale.cpp @@ -122,7 +122,7 @@ bool EffectTimeScale::DefineParams( ShuttleParams & S ){ return true; } -bool EffectTimeScale::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectTimeScale::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_RatePercentStart, m_RatePercentChangeStart); parms.Write(KEY_RatePercentEnd, m_RatePercentChangeEnd); @@ -134,7 +134,7 @@ bool EffectTimeScale::GetAutomationParameters(CommandAutomationParameters & parm return true; } -bool EffectTimeScale::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectTimeScale::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(RatePercentStart); ReadAndVerifyDouble(RatePercentEnd); diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h index c034f4d68..d4d4be0b2 100644 --- a/src/effects/TimeScale.h +++ b/src/effects/TimeScale.h @@ -46,8 +46,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index e946c3e51..a05a14608 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -280,7 +280,7 @@ bool EffectToneGen::DefineParams( ShuttleParams & S ){ return true; } -bool EffectToneGen::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectToneGen::GetAutomationParameters(CommandParameters & parms) { if (mChirp) { @@ -301,7 +301,7 @@ bool EffectToneGen::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool EffectToneGen::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectToneGen::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyEnum(Waveform, wxArrayString(nWaveforms, kWaveStrings)); ReadAndVerifyEnum(Interp, wxArrayString(nInterpolations, kInterStrings)); diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h index b8416c15b..348bfd077 100644 --- a/src/effects/ToneGen.h +++ b/src/effects/ToneGen.h @@ -47,8 +47,8 @@ public: bool ProcessInitialize(sampleCount totalLen, ChannelNames chanMap = NULL) override; size_t ProcessBlock(float **inBlock, float **outBlock, size_t blockLen) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index 51fa94a49..ce8322ca9 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -148,7 +148,7 @@ bool EffectTruncSilence::DefineParams( ShuttleParams & S ){ return true; } -bool EffectTruncSilence::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectTruncSilence::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_DbIndex, Enums::DbChoices[mTruncDbChoiceIndex]); parms.Write(KEY_ActIndex, kActionStrings[mActionIndex]); @@ -160,7 +160,7 @@ bool EffectTruncSilence::GetAutomationParameters(CommandAutomationParameters & p return true; } -bool EffectTruncSilence::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectTruncSilence::SetAutomationParameters(CommandParameters & parms) { wxArrayString actions(nActions, kActionStrings); actions.Insert(wxT("0"), 0); // Compatible with 2.1.0 and before diff --git a/src/effects/TruncSilence.h b/src/effects/TruncSilence.h index 8bccb7add..2cb289193 100644 --- a/src/effects/TruncSilence.h +++ b/src/effects/TruncSilence.h @@ -52,8 +52,8 @@ public: // EffectClientInterface implementation bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 8dd265e45..052c765ff 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -1631,7 +1631,7 @@ bool VSTEffect::ShowInterface(wxWindow *parent, bool forceModal) return res; } -bool VSTEffect::GetAutomationParameters(CommandAutomationParameters & parms) +bool VSTEffect::GetAutomationParameters(CommandParameters & parms) { for (int i = 0; i < mAEffect->numParams; i++) { @@ -1651,7 +1651,7 @@ bool VSTEffect::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool VSTEffect::SetAutomationParameters(CommandAutomationParameters & parms) +bool VSTEffect::SetAutomationParameters(CommandParameters & parms) { callDispatcher(effBeginSetProgram, 0, 0, NULL, 0.0); for (int i = 0; i < mAEffect->numParams; i++) @@ -2335,7 +2335,7 @@ bool VSTEffect::LoadParameters(const wxString & group) return false; } - CommandAutomationParameters eap; + CommandParameters eap; if (!eap.SetParameters(parms)) { return false; @@ -2363,7 +2363,7 @@ bool VSTEffect::SaveParameters(const wxString & group) return true; } - CommandAutomationParameters eap; + CommandParameters eap; if (!GetAutomationParameters(eap)) { return false; diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h index 9100db0c8..ccf4e12b7 100644 --- a/src/effects/VST/VSTEffect.h +++ b/src/effects/VST/VSTEffect.h @@ -138,8 +138,8 @@ class VSTEffect final : public wxEvtHandler, bool ShowInterface(wxWindow *parent, bool forceModal = false) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadUserPreset(const wxString & name) override; bool SaveUserPreset(const wxString & name) override; diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index 8181c2bf9..ccbd45385 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -196,7 +196,7 @@ bool EffectWahwah::DefineParams( ShuttleParams & S ){ return true; } -bool EffectWahwah::GetAutomationParameters(CommandAutomationParameters & parms) +bool EffectWahwah::GetAutomationParameters(CommandParameters & parms) { parms.Write(KEY_Freq, mFreq); parms.Write(KEY_Phase, mPhase); @@ -208,7 +208,7 @@ bool EffectWahwah::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool EffectWahwah::SetAutomationParameters(CommandAutomationParameters & parms) +bool EffectWahwah::SetAutomationParameters(CommandParameters & parms) { ReadAndVerifyDouble(Freq); ReadAndVerifyDouble(Phase); diff --git a/src/effects/Wahwah.h b/src/effects/Wahwah.h index fc996a392..9bbd99491 100644 --- a/src/effects/Wahwah.h +++ b/src/effects/Wahwah.h @@ -72,8 +72,8 @@ public: float **outbuf, size_t numSamples) override; bool DefineParams( ShuttleParams & S ) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp index f97609548..af2b1a578 100644 --- a/src/effects/audiounits/AudioUnitEffect.cpp +++ b/src/effects/audiounits/AudioUnitEffect.cpp @@ -1477,7 +1477,7 @@ bool AudioUnitEffect::ShowInterface(wxWindow *parent, bool forceModal) return res; } -bool AudioUnitEffect::GetAutomationParameters(CommandAutomationParameters & parms) +bool AudioUnitEffect::GetAutomationParameters(CommandParameters & parms) { OSStatus result; UInt32 dataSize; @@ -1550,7 +1550,7 @@ bool AudioUnitEffect::GetAutomationParameters(CommandAutomationParameters & parm return true; } -bool AudioUnitEffect::SetAutomationParameters(CommandAutomationParameters & parms) +bool AudioUnitEffect::SetAutomationParameters(CommandParameters & parms) { OSStatus result; UInt32 dataSize; @@ -1895,7 +1895,7 @@ bool AudioUnitEffect::LoadParameters(const wxString & group) return false; } - CommandAutomationParameters eap; + CommandParameters eap; if (!eap.SetParameters(parms)) { return false; @@ -1906,7 +1906,7 @@ bool AudioUnitEffect::LoadParameters(const wxString & group) bool AudioUnitEffect::SaveParameters(const wxString & group) { - CommandAutomationParameters eap; + CommandParameters eap; if (!GetAutomationParameters(eap)) { return false; diff --git a/src/effects/audiounits/AudioUnitEffect.h b/src/effects/audiounits/AudioUnitEffect.h index e245e1120..2e8eb028c 100644 --- a/src/effects/audiounits/AudioUnitEffect.h +++ b/src/effects/audiounits/AudioUnitEffect.h @@ -104,8 +104,8 @@ public: bool ShowInterface(wxWindow *parent, bool forceModal = false) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadUserPreset(const wxString & name) override; bool SaveUserPreset(const wxString & name) override; diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp index ae6c435b7..936d08b56 100644 --- a/src/effects/ladspa/LadspaEffect.cpp +++ b/src/effects/ladspa/LadspaEffect.cpp @@ -1076,7 +1076,7 @@ bool LadspaEffect::ShowInterface(wxWindow *parent, bool forceModal) return res; } -bool LadspaEffect::GetAutomationParameters(CommandAutomationParameters & parms) +bool LadspaEffect::GetAutomationParameters(CommandParameters & parms) { for (unsigned long p = 0; p < mData->PortCount; p++) { @@ -1094,7 +1094,7 @@ bool LadspaEffect::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool LadspaEffect::SetAutomationParameters(CommandAutomationParameters & parms) +bool LadspaEffect::SetAutomationParameters(CommandParameters & parms) { for (unsigned long p = 0; p < mData->PortCount; p++) { @@ -1604,7 +1604,7 @@ bool LadspaEffect::LoadParameters(const wxString & group) return false; } - CommandAutomationParameters eap; + CommandParameters eap; if (!eap.SetParameters(parms)) { return false; @@ -1615,7 +1615,7 @@ bool LadspaEffect::LoadParameters(const wxString & group) bool LadspaEffect::SaveParameters(const wxString & group) { - CommandAutomationParameters eap; + CommandParameters eap; if (!GetAutomationParameters(eap)) { return false; diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h index 6bf022bc8..bda2ec346 100644 --- a/src/effects/ladspa/LadspaEffect.h +++ b/src/effects/ladspa/LadspaEffect.h @@ -99,8 +99,8 @@ public: bool ShowInterface(wxWindow *parent, bool forceModal = false) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; bool LoadUserPreset(const wxString & name) override; bool SaveUserPreset(const wxString & name) override; diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index f17042a27..b125d82d9 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -953,7 +953,7 @@ bool LV2Effect::ShowInterface(wxWindow *parent, bool forceModal) return res; } -bool LV2Effect::GetAutomationParameters(CommandAutomationParameters & parms) +bool LV2Effect::GetAutomationParameters(CommandParameters & parms) { for (size_t p = 0, cnt = mControls.size(); p < cnt; p++) { @@ -969,7 +969,7 @@ bool LV2Effect::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool LV2Effect::SetAutomationParameters(CommandAutomationParameters & parms) +bool LV2Effect::SetAutomationParameters(CommandParameters & parms) { // First pass validates values for (size_t p = 0, cnt = mControls.size(); p < cnt; p++) @@ -1261,7 +1261,7 @@ bool LV2Effect::LoadParameters(const wxString & group) return false; } - CommandAutomationParameters eap; + CommandParameters eap; if (!eap.SetParameters(parms)) { return false; @@ -1272,7 +1272,7 @@ bool LV2Effect::LoadParameters(const wxString & group) bool LV2Effect::SaveParameters(const wxString & group) { - CommandAutomationParameters eap; + CommandParameters eap; if (!GetAutomationParameters(eap)) { return false; diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index bebec0c60..7fcd01ccd 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -162,8 +162,8 @@ public: bool ShowInterface(wxWindow *parent, bool forceModal = false) override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // EffectUIClientInterface implementation diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 11010699b..f3e22d45d 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -279,7 +279,7 @@ bool NyquistEffect::IsDefault() // EffectClientInterface implementation -bool NyquistEffect::GetAutomationParameters(CommandAutomationParameters & parms) +bool NyquistEffect::GetAutomationParameters(CommandParameters & parms) { if (mExternal) { @@ -326,7 +326,7 @@ bool NyquistEffect::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool NyquistEffect::SetAutomationParameters(CommandAutomationParameters & parms) +bool NyquistEffect::SetAutomationParameters(CommandParameters & parms) { if (mExternal) { diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h index 851bbc2e1..09956cdb1 100644 --- a/src/effects/nyquist/Nyquist.h +++ b/src/effects/nyquist/Nyquist.h @@ -97,8 +97,8 @@ public: // EffectClientInterface implementation - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp index c07453c04..ae7e4bc56 100644 --- a/src/effects/vamp/VampEffect.cpp +++ b/src/effects/vamp/VampEffect.cpp @@ -158,7 +158,7 @@ unsigned VampEffect::GetAudioInCount() return mPlugin->getMaxChannelCount(); } -bool VampEffect::GetAutomationParameters(CommandAutomationParameters & parms) +bool VampEffect::GetAutomationParameters(CommandParameters & parms) { for (size_t p = 0, cnt = mParameters.size(); p < cnt; p++) { @@ -204,7 +204,7 @@ bool VampEffect::GetAutomationParameters(CommandAutomationParameters & parms) return true; } -bool VampEffect::SetAutomationParameters(CommandAutomationParameters & parms) +bool VampEffect::SetAutomationParameters(CommandParameters & parms) { // First pass verifies values for (size_t p = 0, cnt = mParameters.size(); p < cnt; p++) diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h index f9355cd77..7f408d157 100644 --- a/src/effects/vamp/VampEffect.h +++ b/src/effects/vamp/VampEffect.h @@ -62,8 +62,8 @@ public: // EffectClientInterface implementation unsigned GetAudioInCount() override; - bool GetAutomationParameters(CommandAutomationParameters & parms) override; - bool SetAutomationParameters(CommandAutomationParameters & parms) override; + bool GetAutomationParameters(CommandParameters & parms) override; + bool SetAutomationParameters(CommandParameters & parms) override; // Effect implementation