1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-03 17:19:43 +02:00

A few more uses of type alias EnumValueSymbol where more proper

This commit is contained in:
Paul Licameli 2019-03-19 15:14:50 -04:00
parent d326220f0c
commit da895783fd
4 changed files with 11 additions and 11 deletions

View File

@ -397,7 +397,7 @@ wxString EnumSetting::Read() const
size_t EnumSetting::Find( const wxString &value ) const
{
return size_t(
std::find( begin(), end(), ComponentInterfaceSymbol{ value, {} } )
std::find( begin(), end(), EnumValueSymbol{ value, {} } )
- mSymbols );
}

View File

@ -69,7 +69,7 @@ class EnumSetting
public:
EnumSetting(
const wxString &key,
const ComponentInterfaceSymbol symbols[], size_t nSymbols,
const EnumValueSymbol symbols[], size_t nSymbols,
size_t defaultSymbol
)
: mKey{ key }
@ -83,10 +83,10 @@ public:
}
const wxString &Key() const { return mKey; }
const ComponentInterfaceSymbol &Default() const
const EnumValueSymbol &Default() const
{ return mSymbols[mDefaultSymbol]; }
const ComponentInterfaceSymbol *begin() const { return mSymbols; }
const ComponentInterfaceSymbol *end() const { return mSymbols + mnSymbols; }
const EnumValueSymbol *begin() const { return mSymbols; }
const EnumValueSymbol *end() const { return mSymbols + mnSymbols; }
wxString Read() const;
bool Write( const wxString &value ); // you flush gPrefs afterward
@ -97,7 +97,7 @@ protected:
const wxString mKey;
const ComponentInterfaceSymbol *mSymbols;
const EnumValueSymbol *mSymbols;
const size_t mnSymbols;
// stores an internal value
@ -115,7 +115,7 @@ class EncodedEnumSetting : public EnumSetting
public:
EncodedEnumSetting(
const wxString &key,
const ComponentInterfaceSymbol symbols[], size_t nSymbols,
const EnumValueSymbol symbols[], size_t nSymbols,
size_t defaultSymbol,
const int intValues[] = nullptr, // must have same size as symbols

View File

@ -32,7 +32,7 @@
//////////
static const ComponentInterfaceSymbol choicesFormat[] = {
static const EnumValueSymbol choicesFormat[] = {
{ wxT("Format16Bit"), XO("16-bit") },
{ wxT("Format24Bit"), XO("24-bit") },
{ wxT("Format32BitFloat"), XO("32-bit float") }

View File

@ -57,7 +57,7 @@ namespace {
//////////
static const ComponentInterfaceSymbol choicesView[] = {
static const EnumValueSymbol choicesView[] = {
{ XO("Waveform") },
{ wxT("WaveformDB"), XO("Waveform (dB)") },
{ XO("Spectrogram") }
@ -76,7 +76,7 @@ class TracksViewModeSetting : public EncodedEnumSetting {
public:
TracksViewModeSetting(
const wxString &key,
const ComponentInterfaceSymbol symbols[], size_t nSymbols,
const EnumValueSymbol symbols[], size_t nSymbols,
size_t defaultSymbol,
const int intValues[],
@ -130,7 +130,7 @@ WaveTrack::WaveTrackDisplay TracksPrefs::ViewModeChoice()
}
//////////
static const ComponentInterfaceSymbol choicesSampleDisplay[] = {
static const EnumValueSymbol choicesSampleDisplay[] = {
{ wxT("ConnectDots"), XO("Connect dots") },
{ wxT("StemPlot"), XO("Stem plot") }
};