Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00
Code Issues Releases Wiki Activity

Nyquist Prompt: Remove legacy code checkboox

Browse Source
This commit is contained in:
SteveDaulton 2020-08-17 22:16:04 +01:00
parent a278eff55b
commit 25ddfc7bb4
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/effects/nyquist/Nyquist.cpp
View File

@ -94,7 +94,6 @@ int NyquistEffect::mReentryCount = 0;
enum enum
{ {
ID_Editor = 10000, ID_Editor = 10000,
ID_Version,
ID_Load, ID_Load,
ID_Save, ID_Save,
@ -110,7 +109,6 @@ enum
#define UNINITIALIZED_CONTROL ((double)99999999.99) #define UNINITIALIZED_CONTROL ((double)99999999.99)
static const wxChar *KEY_Version = wxT("Version");
static const wxChar *KEY_Command = wxT("Command"); static const wxChar *KEY_Command = wxT("Command");
static const wxChar *KEY_Parameters = wxT("Parameters"); static const wxChar *KEY_Parameters = wxT("Parameters");
@ -322,7 +320,6 @@ bool NyquistEffect::DefineParams( ShuttleParams & S )
if (mIsPrompt) if (mIsPrompt)
{ {
S.Define( mInputCmd, KEY_Command, "" ); S.Define( mInputCmd, KEY_Command, "" );
S.Define( mVersion, KEY_Version, 3 );
S.Define( mParameters, KEY_Parameters, "" ); S.Define( mParameters, KEY_Parameters, "" );
return true; return true;
} }
@ -370,7 +367,6 @@ bool NyquistEffect::GetAutomationParameters(CommandParameters & parms)
if (mIsPrompt) if (mIsPrompt)
{ {
parms.Write(KEY_Command, mInputCmd); parms.Write(KEY_Command, mInputCmd);
parms.Write(KEY_Version, mVersion);
parms.Write(KEY_Parameters, mParameters); parms.Write(KEY_Parameters, mParameters);
return true; return true;
@ -420,7 +416,6 @@ bool NyquistEffect::SetAutomationParameters(CommandParameters & parms)
if (mIsPrompt) if (mIsPrompt)
{ {
parms.Read(KEY_Command, &mInputCmd, wxEmptyString); parms.Read(KEY_Command, &mInputCmd, wxEmptyString);
parms.Read(KEY_Version, &mVersion, mVersion);
parms.Read(KEY_Parameters, &mParameters, wxEmptyString); parms.Read(KEY_Parameters, &mParameters, wxEmptyString);
if (!mInputCmd.empty()) if (!mInputCmd.empty())
@ -560,6 +555,7 @@ bool NyquistEffect::Init()
mIsSpectral = false; mIsSpectral = false;
mDebugButton = true; // Debug button always enabled for Nyquist Prompt. mDebugButton = true; // Debug button always enabled for Nyquist Prompt.
mEnablePreview = true; // Preview button always enabled for Nyquist Prompt. mEnablePreview = true; // Preview button always enabled for Nyquist Prompt.
mVersion = 4;
} }
// As of Audacity 2.1.2 rc1, 'spectral' effects are allowed only if // As of Audacity 2.1.2 rc1, 'spectral' effects are allowed only if
@ -2573,7 +2569,6 @@ FilePaths NyquistEffect::GetNyquistSearchPath()
bool NyquistEffect::TransferDataToPromptWindow() bool NyquistEffect::TransferDataToPromptWindow()
{ {
mCommandText->ChangeValue(mInputCmd); mCommandText->ChangeValue(mInputCmd);
mVersionCheckBox->SetValue(mVersion <= 3);
return true; return true;
} }
@ -2625,8 +2620,6 @@ bool NyquistEffect::TransferDataFromPromptWindow()
mInputCmd.Replace(leftSingle, dumbSingle, true); mInputCmd.Replace(leftSingle, dumbSingle, true);
mInputCmd.Replace(rightSingle, dumbSingle, true); mInputCmd.Replace(rightSingle, dumbSingle, true);
mVersion = mVersionCheckBox->GetValue() ? 3 : 4;
return ParseCommand(mInputCmd); return ParseCommand(mInputCmd);
} }
@ -2781,9 +2774,6 @@ void NyquistEffect::BuildPromptWindow(ShuttleGui & S)
S.AddVariableText(XO("Enter Nyquist Command: ")); S.AddVariableText(XO("Enter Nyquist Command: "));
S.AddSpace(1, 1); S.AddSpace(1, 1);
mVersionCheckBox = S.AddCheckBox(XXO("&Use legacy (version 3) syntax."),
(mVersion == 3));
} }
S.EndMultiColumn(); S.EndMultiColumn();

1
src/effects/nyquist/Nyquist.h
View File

@ -282,7 +282,6 @@ private:
int mMergeClips; int mMergeClips;
wxTextCtrl *mCommandText; wxTextCtrl *mCommandText;
wxCheckBox *mVersionCheckBox;
std::exception_ptr mpException {}; std::exception_ptr mpException {};