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

A few more uses of type alias EnumValueSymbol where more proper

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Prefs.cpp
View File

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

12
src/Prefs.h
View File

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

2
src/prefs/QualityPrefs.cpp
View File

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

6
src/prefs/TracksPrefs.cpp
View File

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