mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-26 00:03:52 +02:00
Merge remote-tracking branch 'upstream/master' into wx3
This commit is contained in:
@@ -60,25 +60,10 @@ void TracksPrefs::Populate()
|
||||
// we don't display them by increasing integer values.
|
||||
|
||||
mViewChoices.Add(_("Waveform"));
|
||||
mViewCodes.Add(int(WaveTrack::WaveformDisplay));
|
||||
mViewCodes.Add(int(WaveTrack::Waveform));
|
||||
|
||||
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));
|
||||
mViewChoices.Add(_("Spectrum"));
|
||||
mViewCodes.Add(WaveTrack::Spectrum);
|
||||
|
||||
//------------------------- Main section --------------------
|
||||
// Now construct the GUI itself.
|
||||
@@ -165,3 +150,8 @@ bool TracksPrefs::Apply()
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
PrefsPanel *TracksPrefsFactory::Create(wxWindow *parent)
|
||||
{
|
||||
return new TracksPrefs(parent);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user