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

Remove overloads that are not needed after 277537c

Browse Source
This commit is contained in:
Paul Licameli 2018-03-26 13:25:03 -04:00
parent a4a588610e
commit ab509acdf7
3 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/audacity/EffectAutomationParameters.h
View File

@ -194,18 +194,6 @@ public:
return true; 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) bool WriteEnum(const wxString & key, int value, const wxArrayString & choices)
{ {
if (value < 0 || value >= (int) choices.GetCount()) if (value < 0 || value >= (int) choices.GetCount())
@ -261,15 +249,6 @@ public:
return (*val != wxNOT_FOUND); 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) bool GetParameters(wxString & parms)
{ {
wxFileConfig::SetPath(wxT("/")); wxFileConfig::SetPath(wxT("/"));

36
src/Shuttle.cpp
View File

@ -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 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( 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::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 ){;}; 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); 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 ) void ShuttleGetAutomation::DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )
{ {
if( !ShouldSet() ) return; 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 ) void ShuttleSetAutomation::DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )
{ {
CouldGet( key ); 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<strings.Count(); i++ )
AddItem( strings[i] );
EndArray();
EndField();
EndStruct();
}
void ShuttleGetDefinition::DefineEnum( int&var, const wxChar * key, const int vdefault, wxArrayString strings ) void ShuttleGetDefinition::DefineEnum( int&var, const wxChar * key, const int vdefault, wxArrayString strings )
{ {
StartStruct(); StartStruct();

7
src/Shuttle.h
View File

@ -83,7 +83,6 @@ public:
virtual void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl=1.0f ); virtual void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl=1.0f );
virtual void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl=1.0f ); virtual void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl=1.0f );
virtual void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin="", const wxString vmax="", const wxString vscl="" ); virtual void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin="", const wxString vmax="", const wxString vscl="" );
virtual void DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings );
virtual void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings ); virtual void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings );
}; };
@ -101,7 +100,6 @@ public:
void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl ) override; void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl ) override;
void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl ) override; void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl ) override;
void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin, const wxString vmax, const wxString vscl ) override; void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin, const wxString vmax, const wxString vscl ) override;
void DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings )override;
void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )override; void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )override;
}; };
@ -125,7 +123,6 @@ public:
void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl ) override; void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl ) override;
void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl ) override; void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl ) override;
void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin, const wxString vmax, const wxString vscl ) override; void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin, const wxString vmax, const wxString vscl ) override;
void DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings )override;
void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )override; void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )override;
}; };
@ -146,7 +143,6 @@ public:
void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl ) override; void Define( double & var, const wxChar * key, const float vdefault, const float vmin, const float vmax, const float vscl ) override;
void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl ) override; void Define( double & var, const wxChar * key, const double vdefault, const double vmin, const double vmax, const double vscl ) override;
void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin, const wxString vmax, const wxString vscl ) override; void Define( wxString &var, const wxChar * key, const wxString vdefault, const wxString vmin, const wxString vmax, const wxString vscl ) override;
void DefineEnum( wxString &var, const wxChar * key, const wxString vdefault, wxArrayString strings )override;
void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )override; void DefineEnum( int &var, const wxChar * key, const int vdefault, wxArrayString strings )override;
}; };
@ -183,9 +179,6 @@ public:
void Define( wxString &var, const wxChar * WXUNUSED(key), const wxString vdefault, void Define( wxString &var, const wxChar * WXUNUSED(key), const wxString vdefault,
const wxString WXUNUSED(vmin), const wxString WXUNUSED(vmax), const wxString WXUNUSED(vscl) ) const wxString WXUNUSED(vmin), const wxString WXUNUSED(vmax), const wxString WXUNUSED(vscl) )
override { var = vdefault;}; override { var = vdefault;};
void DefineEnum( wxString &var, const wxChar * WXUNUSED(key), const wxString vdefault,
wxArrayString WXUNUSED(strings) )
override { var = vdefault;};
void DefineEnum( int &var, const wxChar * WXUNUSED(key), const int vdefault, void DefineEnum( int &var, const wxChar * WXUNUSED(key), const int vdefault,
wxArrayString WXUNUSED(strings) ) wxArrayString WXUNUSED(strings) )
override { var = vdefault;}; override { var = vdefault;};