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

Remove Waveforms page from Preferences, put Spectrograms back in old place

Browse Source
This commit is contained in:
Paul Licameli
2015-08-19 00:10:42 -04:00
parent 28d552c39b
commit 0a41a1eba2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/prefs/PrefsDialog.cpp
View File

@@ -64,7 +64,8 @@
#include "ThemePrefs.h" #include "ThemePrefs.h"
#include "TracksPrefs.h" #include "TracksPrefs.h"
#include "WarningsPrefs.h" #include "WarningsPrefs.h"
#include "WaveformPrefs.h" // #include "WaveformPrefs.h"
#include "WaveformSettings.h"
#include "ExtImportPrefs.h" #include "ExtImportPrefs.h"
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
@@ -132,7 +133,7 @@ PrefsDialog::Factories
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || !defined(DISABLE_DYNAMIC_LOADING_LAME) #if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || !defined(DISABLE_DYNAMIC_LOADING_LAME)
static LibraryPrefsFactory libraryPrefsFactory; static LibraryPrefsFactory libraryPrefsFactory;
#endif #endif
static WaveformPrefsFactory waveformPrefsFactory; // static WaveformPrefsFactory waveformPrefsFactory;
static SpectrumPrefsFactory spectrumPrefsFactory; static SpectrumPrefsFactory spectrumPrefsFactory;
static DirectoriesPrefsFactory directoriesPrefsFactory; static DirectoriesPrefsFactory directoriesPrefsFactory;
static WarningsPrefsFactory warningsPrefsFactory; static WarningsPrefsFactory warningsPrefsFactory;
@@ -157,10 +158,9 @@ PrefsDialog::Factories
&qualityPrefsFactory, &qualityPrefsFactory,
&guiPrefsFactory, &guiPrefsFactory,
// Group two other pages &tracksPrefsFactory,
PrefsNode(&tracksPrefsFactory, 2, true), // &waveformPrefsFactory,
&waveformPrefsFactory, // &spectrumPrefsFactory,
&spectrumPrefsFactory,
// Group one other page // Group one other page
PrefsNode(&importExportPrefsFactory, 1, true), PrefsNode(&importExportPrefsFactory, 1, true),
@@ -170,6 +170,7 @@ PrefsDialog::Factories
#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || !defined(DISABLE_DYNAMIC_LOADING_LAME) #if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG) || !defined(DISABLE_DYNAMIC_LOADING_LAME)
&libraryPrefsFactory, &libraryPrefsFactory,
#endif #endif
&spectrumPrefsFactory,
&directoriesPrefsFactory, &directoriesPrefsFactory,
&warningsPrefsFactory, &warningsPrefsFactory,
&effectsPrefsFactory, &effectsPrefsFactory,