Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 15:23:48 +01:00
Code Issues Releases Wiki Activity

Bugs 1043, 1044 -- Even better fix...

Browse Source 
... With a careful sweep of uses of WaveTrack::GetDisplay() to remove
assumptions about the ordering of the values.

Using < and <= on enum values is mostly a bad idea.
This commit is contained in:
Paul Licameli
2015-06-23 10:49:45 -04:00
parent b25994a82d
commit 508abda309
3 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/prefs/TracksPrefs.cpp
View File

@@ -56,23 +56,29 @@ void TracksPrefs::Populate()
mSoloChoices.Add(_("None"));
// Keep the same order as in TrackPanel.cpp menu: OnWaveformID, OnWaveformDBID, OnSpectrumID, OnSpectrumLogID,
// OnSpectralSelID, OnSpectralSelLogID, OnPitchID
mViewCodes.Add(0);
mViewCodes.Add(1);
mViewCodes.Add(2);
mViewCodes.Add(3);
mViewCodes.Add(4);
mViewCodes.Add(5);
mViewCodes.Add(6);
// Keep view choices and codes in proper correspondence --
// we don't display them by increasing integer values.
mViewChoices.Add(_("Waveform"));
mViewCodes.Add(int(WaveTrack::WaveformDisplay));
mViewChoices.Add(_("Waveform (dB)"));
mViewCodes.Add(int(WaveTrack::WaveformDBDisplay));
mViewChoices.Add(_("Spectrogram"));
mViewCodes.Add(int(WaveTrack::SpectrumDisplay));
mViewChoices.Add(_("Spectrogram log(f)"));
mViewCodes.Add(int(WaveTrack::SpectrumLogDisplay));
mViewChoices.Add(_("Spectral Selection"));
mViewCodes.Add(int(WaveTrack::SpectralSelectionDisplay));
mViewChoices.Add(_("Spectral Selection log(f)"));
mViewCodes.Add(int(WaveTrack::SpectralSelectionLogDisplay));
mViewChoices.Add(_("Pitch (EAC)"));
mViewCodes.Add(int(WaveTrack::PitchDisplay));
//------------------------- Main section --------------------
// Now construct the GUI itself.