diff --git a/include/audacity/EffectAutomationParameters.h b/include/audacity/EffectAutomationParameters.h index 91148c315..cca81ae4d 100644 --- a/include/audacity/EffectAutomationParameters.h +++ b/include/audacity/EffectAutomationParameters.h @@ -194,18 +194,6 @@ public: return true; } - bool ReadEnum(const wxString & key, int *pi, const wxString & defVal, - const wxArrayString & choices, - const ObsoleteMap obsoletes[] = nullptr, - size_t nObsoletes = 0) const - { - if (!ReadEnum(key, pi, choices, obsoletes, nObsoletes)) - { - *pi = choices.Index(defVal); - } - return true; - } - bool WriteEnum(const wxString & key, int value, const wxArrayString & choices) { if (value < 0 || value >= (int) choices.GetCount()) @@ -261,15 +249,6 @@ public: return (*val != wxNOT_FOUND); } - bool ReadAndVerify(const wxString & key, int *val, const wxString & defVal, - const wxArrayString & choices, - const ObsoleteMap obsoletes[] = nullptr, - size_t nObsoletes = 0) const - { - ReadEnum(key, val, defVal, choices, obsoletes, nObsoletes); - return (*val != wxNOT_FOUND); - } - bool GetParameters(wxString & parms) { wxFileConfig::SetPath(wxT("/")); diff --git a/src/Shuttle.cpp b/src/Shuttle.cpp index 23f8ddf01..75ffa5f33 100644 --- a/src/Shuttle.cpp +++ b/src/Shuttle.cpp @@ -362,7 +362,6 @@ void ShuttleParams::Define( float & var, const wxChar * key, const float vdef void ShuttleParams::Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl ){;}; void ShuttleParams::Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl ){;}; void ShuttleParams::Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin, const wxString vmax, const wxString vscl ){;}; -void ShuttleParams::DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings ){;}; void ShuttleParams::DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings ){;}; @@ -422,12 +421,6 @@ void ShuttleGetAutomation::Define( wxString &var, const wxChar * key, const wxSt mpEap->Write(key, var); } -void ShuttleGetAutomation::DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings ) -{ - if( !ShouldSet() ) return; - mpEap->Write(key, var); -} - void ShuttleGetAutomation::DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings ) { if( !ShouldSet() ) return; @@ -538,17 +531,6 @@ void ShuttleSetAutomation::Define( wxString &var, const wxChar * key, const wxSt } -void ShuttleSetAutomation::DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings ) -{ - CouldGet( key ); - if( !bOK ) - return; - int temp =0; - bOK = mpEap->ReadAndVerify(key, &temp, vdefault, strings); - if( bWrite && bOK) - var = strings[temp]; -} - void ShuttleSetAutomation::DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings ) { CouldGet( key ); @@ -664,24 +646,6 @@ void ShuttleGetDefinition::Define( wxString &var, const wxChar * key, const wxSt } -void ShuttleGetDefinition::DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings ) -{ - StartStruct(); - AddItem( wxString(key), "key" ); - AddItem( "enum", "type" ); - if( IsOptional() ) - AddItem( "unchanged", "default" ); - else - AddItem( vdefault, "default" ); - StartField( "enum" ); - StartArray(); - for( size_t i=0;i