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

Move some enums into new files WaveTrackViewConstants.* ...

Browse Source 
... freeing TracksPrefs from the second largest s.c.c. which is now only 20
This commit is contained in:
Paul Licameli
2019-05-29 11:51:09 -04:00
parent aa1ce03100
commit a6e2ca0aa8
35 changed files with 342 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/prefs/TracksPrefs.cpp
View File

@@ -60,9 +60,9 @@ static const EnumValueSymbol choicesView[] = {
{ XO("Spectrogram") }
};
static const int intChoicesView[] = {
(int)(WaveTrack::Waveform),
(int)(WaveTrack::obsoleteWaveformDBDisplay),
(int)(WaveTrack::Spectrum)
(int)(WaveTrackViewConstants::Waveform),
(int)(WaveTrackViewConstants::obsoleteWaveformDBDisplay),
(int)(WaveTrackViewConstants::Spectrum)
};
static const size_t nChoicesView = WXSIZEOF(choicesView);
static_assert( nChoicesView == WXSIZEOF(intChoicesView), "size mismatch" );
@@ -100,11 +100,11 @@ public:
int oldMode;
gPrefs->Read(wxT("/GUI/DefaultViewMode"), // The very old key
&oldMode,
(int)(WaveTrack::Waveform));
auto viewMode = WaveTrack::ConvertLegacyDisplayValue(oldMode);
(int)(WaveTrackViewConstants::Waveform));
auto viewMode = WaveTrackViewConstants::ConvertLegacyDisplayValue(oldMode);
// Now future-proof 2.1.1 against a recurrence of this sort of bug!
viewMode = WaveTrack::ValidateWaveTrackDisplay(viewMode);
viewMode = WaveTrackViewConstants::ValidateWaveTrackDisplay(viewMode);
const_cast<TracksViewModeSetting*>(this)->WriteInt( viewMode );
gPrefs->Flush();
@@ -121,9 +121,9 @@ static TracksViewModeSetting viewModeSetting{
wxT("/GUI/DefaultViewModeNew")
};
WaveTrack::WaveTrackDisplay TracksPrefs::ViewModeChoice()
WaveTrackViewConstants::Display TracksPrefs::ViewModeChoice()
{
return (WaveTrack::WaveTrackDisplay) viewModeSetting.ReadInt();
return (WaveTrackViewConstants::Display) viewModeSetting.ReadInt();
}
//////////
@@ -133,8 +133,8 @@ static const EnumValueSymbol choicesSampleDisplay[] = {
};
static const size_t nChoicesSampleDisplay = WXSIZEOF( choicesSampleDisplay );
static const int intChoicesSampleDisplay[] = {
(int) WaveTrack::LinearInterpolate,
(int) WaveTrack::StemPlot
(int) WaveTrackViewConstants::LinearInterpolate,
(int) WaveTrackViewConstants::StemPlot
};
static_assert(
nChoicesSampleDisplay == WXSIZEOF(intChoicesSampleDisplay), "size mismatch" );
@@ -149,9 +149,9 @@ static EnumSetting sampleDisplaySetting{
wxT("/GUI/SampleView")
};
WaveTrack::SampleDisplay TracksPrefs::SampleViewChoice()
WaveTrackViewConstants::SampleDisplay TracksPrefs::SampleViewChoice()
{
return (WaveTrack::SampleDisplay) sampleDisplaySetting.ReadInt();
return (WaveTrackViewConstants::SampleDisplay) sampleDisplaySetting.ReadInt();
}
//////////
@@ -174,21 +174,21 @@ static const EnumValueSymbol choicesZoom[] = {
};
static const size_t nChoicesZoom = WXSIZEOF( choicesZoom );
static const int intChoicesZoom[] = {
WaveTrack::kZoomToFit,
WaveTrack::kZoomToSelection,
WaveTrack::kZoomDefault,
WaveTrack::kZoomMinutes,
WaveTrack::kZoomSeconds,
WaveTrack::kZoom5ths,
WaveTrack::kZoom10ths,
WaveTrack::kZoom20ths,
WaveTrack::kZoom50ths,
WaveTrack::kZoom100ths,
WaveTrack::kZoom500ths,
WaveTrack::kZoomMilliSeconds,
WaveTrack::kZoomSamples,
WaveTrack::kZoom4To1,
WaveTrack::kMaxZoom,
WaveTrackViewConstants::kZoomToFit,
WaveTrackViewConstants::kZoomToSelection,
WaveTrackViewConstants::kZoomDefault,
WaveTrackViewConstants::kZoomMinutes,
WaveTrackViewConstants::kZoomSeconds,
WaveTrackViewConstants::kZoom5ths,
WaveTrackViewConstants::kZoom10ths,
WaveTrackViewConstants::kZoom20ths,
WaveTrackViewConstants::kZoom50ths,
WaveTrackViewConstants::kZoom100ths,
WaveTrackViewConstants::kZoom500ths,
WaveTrackViewConstants::kZoomMilliSeconds,
WaveTrackViewConstants::kZoomSamples,
WaveTrackViewConstants::kZoom4To1,
WaveTrackViewConstants::kMaxZoom,
};
static_assert( nChoicesZoom == WXSIZEOF(intChoicesZoom), "size mismatch" );
@@ -212,14 +212,14 @@ static EnumSetting zoom2Setting{
wxT("/GUI/ZoomPreset2")
};
WaveTrack::ZoomPresets TracksPrefs::Zoom1Choice()
WaveTrackViewConstants::ZoomPresets TracksPrefs::Zoom1Choice()
{
return (WaveTrack::ZoomPresets) zoom1Setting.ReadInt();
return (WaveTrackViewConstants::ZoomPresets) zoom1Setting.ReadInt();
}
WaveTrack::ZoomPresets TracksPrefs::Zoom2Choice()
WaveTrackViewConstants::ZoomPresets TracksPrefs::Zoom2Choice()
{
return (WaveTrack::ZoomPresets) zoom2Setting.ReadInt();
return (WaveTrackViewConstants::ZoomPresets) zoom2Setting.ReadInt();
}
//////////