From 7e50e9b5af9cac42ee55f31875257b2ef9e6c7c1 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 18 Feb 2021 09:08:38 -0500 Subject: [PATCH] New library for preferences... ... It mentions some wxWidgets types in its interface, but these are in the acceptable utility subset of wxBase that we still consider GUI toolkit-neutral. --- libraries/CMakeLists.txt | 1 + libraries/lib-preferences/CMakeLists.txt | 32 ++++++++++++++++++ .../lib-preferences}/FileConfig.cpp | 10 ------ .../lib-preferences}/FileConfig.h | 2 +- {src => libraries/lib-preferences}/Prefs.cpp | 0 {src => libraries/lib-preferences}/Prefs.h | 33 ++++++++++--------- src/AudacityApp.cpp | 2 +- src/AudacityFileConfig.h | 2 +- src/CMakeLists.txt | 4 --- src/ProjectSettings.h | 1 + src/commands/CommandManager.h | 2 +- src/commands/GetInfoCommand.cpp | 2 +- src/commands/LoadCommands.cpp | 2 +- src/commands/PreferenceCommands.cpp | 2 +- src/commands/ScreenshotCommand.cpp | 2 +- src/effects/AutoDuck.cpp | 2 +- src/effects/BassTreble.cpp | 2 +- src/effects/ChangeSpeed.cpp | 2 +- src/effects/ClickRemoval.cpp | 2 +- src/effects/Compressor.cpp | 2 +- src/effects/Contrast.cpp | 2 +- src/effects/Distortion.cpp | 2 +- src/effects/DtmfGen.cpp | 2 +- src/effects/Equalization.cpp | 2 +- src/effects/Generator.cpp | 2 +- src/effects/LoadEffects.cpp | 2 +- src/effects/Loudness.cpp | 2 +- src/effects/Noise.cpp | 2 +- src/effects/NoiseReduction.cpp | 2 +- src/effects/Normalize.cpp | 2 +- src/effects/Paulstretch.cpp | 2 +- src/effects/Reverb.cpp | 2 +- src/effects/ScienFilter.cpp | 2 +- src/effects/ScoreAlignDialog.cpp | 2 +- src/effects/TruncSilence.cpp | 2 +- src/effects/nyquist/Nyquist.cpp | 2 +- src/export/Export.cpp | 2 +- src/export/ExportCL.cpp | 2 +- src/export/ExportFLAC.cpp | 2 +- src/export/ExportMP2.cpp | 2 +- src/export/ExportMP3.cpp | 2 +- src/export/ExportMultiple.cpp | 2 +- src/export/ExportOGG.cpp | 2 +- src/export/ExportPCM.cpp | 2 +- src/import/Import.cpp | 2 +- src/import/ImportAUP.cpp | 2 +- src/import/ImportFLAC.cpp | 2 +- src/import/ImportLOF.cpp | 2 +- src/import/ImportMP3.cpp | 2 +- src/import/ImportOGG.cpp | 2 +- src/import/ImportPCM.cpp | 2 +- src/import/ImportRaw.cpp | 2 +- src/menus/EditMenus.cpp | 2 +- src/menus/ExtraMenus.cpp | 2 +- src/menus/FileMenus.cpp | 2 +- src/menus/HelpMenus.cpp | 2 +- src/menus/LabelMenus.cpp | 2 +- src/menus/NavigationMenus.cpp | 2 +- src/menus/PluginMenus.cpp | 2 +- src/menus/SelectMenus.cpp | 2 +- src/menus/TrackMenus.cpp | 2 +- src/menus/TransportMenus.cpp | 2 +- src/menus/ViewMenus.cpp | 2 +- src/prefs/ApplicationPrefs.cpp | 2 +- src/prefs/BatchPrefs.cpp | 2 +- src/prefs/DevicePrefs.cpp | 2 +- src/prefs/DirectoriesPrefs.cpp | 2 +- src/prefs/EffectsPrefs.cpp | 2 +- src/prefs/ExtImportPrefs.cpp | 2 +- src/prefs/GUIPrefs.cpp | 2 +- src/prefs/ImportExportPrefs.cpp | 2 +- src/prefs/KeyConfigPrefs.cpp | 2 +- src/prefs/MidiIOPrefs.cpp | 2 +- src/prefs/ModulePrefs.cpp | 2 +- src/prefs/MousePrefs.cpp | 2 +- src/prefs/PlaybackPrefs.cpp | 2 +- src/prefs/PrefsDialog.cpp | 2 +- src/prefs/QualityPrefs.cpp | 2 +- src/prefs/RecordingPrefs.cpp | 2 +- src/prefs/SpectrogramSettings.cpp | 2 +- src/prefs/SpectrogramSettings.h | 2 +- src/prefs/ThemePrefs.cpp | 2 +- src/prefs/TracksBehaviorsPrefs.cpp | 2 +- src/prefs/TracksPrefs.cpp | 2 +- src/prefs/WarningsPrefs.cpp | 2 +- src/prefs/WaveformSettings.cpp | 2 +- src/prefs/WaveformSettings.h | 2 +- src/toolbars/ControlToolBar.cpp | 2 +- src/toolbars/DeviceToolBar.cpp | 2 +- src/toolbars/EditToolBar.cpp | 2 +- src/toolbars/MixerToolBar.cpp | 2 +- src/toolbars/ScrubbingToolBar.cpp | 2 +- src/toolbars/SelectionBar.cpp | 2 +- src/toolbars/SpectralSelectionBar.cpp | 2 +- src/toolbars/ToolBar.cpp | 2 +- src/toolbars/ToolBar.h | 2 +- src/toolbars/ToolDock.cpp | 2 +- src/toolbars/ToolManager.cpp | 2 +- src/toolbars/ToolsToolBar.cpp | 2 +- src/toolbars/TranscriptionToolBar.cpp | 2 +- .../labeltrack/ui/LabelTrackControls.cpp | 2 +- .../notetrack/ui/NoteTrackVZoomHandle.cpp | 2 +- .../wavetrack/ui/SpectrumVZoomHandle.cpp | 2 +- .../wavetrack/ui/SpectrumView.cpp | 2 +- .../wavetrack/ui/WaveTrackVZoomHandle.h | 2 +- .../wavetrack/ui/WaveformVZoomHandle.cpp | 2 +- .../timetrack/ui/TimeTrackVZoomHandle.cpp | 2 +- src/tracks/ui/Scrubbing.h | 2 +- src/widgets/ErrorDialog.cpp | 2 +- src/widgets/FileHistory.cpp | 2 +- src/widgets/HelpSystem.cpp | 2 +- src/widgets/Meter.cpp | 2 +- src/widgets/Meter.h | 2 +- src/widgets/ProgressDialog.cpp | 2 +- 114 files changed, 158 insertions(+), 137 deletions(-) create mode 100644 libraries/lib-preferences/CMakeLists.txt rename {src/widgets => libraries/lib-preferences}/FileConfig.cpp (97%) rename {src/widgets => libraries/lib-preferences}/FileConfig.h (98%) rename {src => libraries/lib-preferences}/Prefs.cpp (100%) rename {src => libraries/lib-preferences}/Prefs.h (94%) diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt index 9fec03f69..891b4d805 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -10,6 +10,7 @@ set( LIBRARIES lib-components lib-basic-ui lib-exceptions + lib-preferences ) if ( ${_OPT}has_networking ) diff --git a/libraries/lib-preferences/CMakeLists.txt b/libraries/lib-preferences/CMakeLists.txt new file mode 100644 index 000000000..878fd30b0 --- /dev/null +++ b/libraries/lib-preferences/CMakeLists.txt @@ -0,0 +1,32 @@ +#[[ +Classes managing settings that persist between runs of the program. + +Settings objects for various types (boolean, numbers, strings, enumerations) +that package a preference key path and a default value (so that literals are +not duplicated in widely separated parts) and cache values in memory. + +PreferenceListener which is a callback notified of certain changes of +preferences. + +PreferenceInitializer is a callback for the reinitialization of preferences. + +FileConfig decorates wxFileConfig, with a (pure virtual) member function to +alert the user of failure to initialize it (as when the file is read-only). +]]# + +set( SOURCES + FileConfig.cpp + FileConfig.h + Prefs.cpp + Prefs.h +) +set( LIBRARIES + lib-utility-interface + lib-basic-ui-interface + lib-components-interface + PRIVATE + wxBase +) +audacity_library( lib-preferences "${SOURCES}" "${LIBRARIES}" + "" "" +) diff --git a/src/widgets/FileConfig.cpp b/libraries/lib-preferences/FileConfig.cpp similarity index 97% rename from src/widgets/FileConfig.cpp rename to libraries/lib-preferences/FileConfig.cpp index 19b8f1da2..6a0f7c0fb 100644 --- a/src/widgets/FileConfig.cpp +++ b/libraries/lib-preferences/FileConfig.cpp @@ -8,17 +8,7 @@ **********************************************************************/ - - #include - -#include -#include -#include -#include -#include -#include -#include #include #include "FileConfig.h" diff --git a/src/widgets/FileConfig.h b/libraries/lib-preferences/FileConfig.h similarity index 98% rename from src/widgets/FileConfig.h rename to libraries/lib-preferences/FileConfig.h index a78d50a82..4b82ce51d 100644 --- a/src/widgets/FileConfig.h +++ b/libraries/lib-preferences/FileConfig.h @@ -18,7 +18,7 @@ #include "Identifier.h" -class FileConfig : public wxConfigBase +class PREFERENCES_API FileConfig : public wxConfigBase { public: FileConfig(const wxString& appName = wxEmptyString, diff --git a/src/Prefs.cpp b/libraries/lib-preferences/Prefs.cpp similarity index 100% rename from src/Prefs.cpp rename to libraries/lib-preferences/Prefs.cpp diff --git a/src/Prefs.h b/libraries/lib-preferences/Prefs.h similarity index 94% rename from src/Prefs.h rename to libraries/lib-preferences/Prefs.h index 39fceeff2..a590455ca 100644 --- a/src/Prefs.h +++ b/libraries/lib-preferences/Prefs.h @@ -36,35 +36,34 @@ #include -#include "ComponentInterface.h" #include "ComponentInterfaceSymbol.h" #include "wxArrayStringEx.h" -#include "widgets/FileConfig.h" +#include "FileConfig.h" #include #include // to declare custom event types class wxFileName; -void InitPreferences( std::unique_ptr uPrefs ); +PREFERENCES_API void InitPreferences( std::unique_ptr uPrefs ); //! Call this to reset preferences to an (almost)-"new" default state /*! There is at least one exception to that: user preferences we want to make more "sticky." Notably, whether automatic update checking is preferred. */ -void ResetPreferences(); -void FinishPreferences(); +PREFERENCES_API void ResetPreferences(); +PREFERENCES_API void FinishPreferences(); -extern AUDACITY_DLL_API FileConfig *gPrefs; +extern PREFERENCES_API FileConfig *gPrefs; extern int gMenusDirty; struct ByColumns_t{}; -extern ByColumns_t ByColumns; +extern PREFERENCES_API ByColumns_t ByColumns; //! Base class for settings objects. It holds a configuration key path. /* The constructors are non-explicit for convenience */ -class AUDACITY_DLL_API SettingBase +class PREFERENCES_API SettingBase { public: SettingBase( const char *path ) : mPath{ path } {} @@ -231,10 +230,12 @@ public: using Setting::Setting; }; +using EnumValueSymbol = ComponentInterfaceSymbol; + /// A table of EnumValueSymbol that you can access by "row" with /// operator [] but also allowing access to the "columns" of internal or /// translated strings, and also allowing convenient column-wise construction -class AUDACITY_DLL_API EnumValueSymbols : public std::vector< EnumValueSymbol > +class PREFERENCES_API EnumValueSymbols : public std::vector< EnumValueSymbol > { public: EnumValueSymbols() = default; @@ -262,7 +263,7 @@ private: /// Packages a table of user-visible choices each with an internal code string, /// a preference key path, and a default choice -class AUDACITY_DLL_API ChoiceSetting +class PREFERENCES_API ChoiceSetting { public: ChoiceSetting( @@ -312,7 +313,7 @@ protected: /// (generally not equal to their table positions), /// and optionally an old preference key path that stored integer codes, to be /// migrated into one that stores internal string values instead -class AUDACITY_DLL_API EnumSettingBase : public ChoiceSetting +class PREFERENCES_API EnumSettingBase : public ChoiceSetting { public: EnumSettingBase( @@ -384,7 +385,7 @@ public: }; //! A listener notified of changes in preferences -class AUDACITY_DLL_API PrefsListener +class PREFERENCES_API PrefsListener { public: //! Call this static function to notify all PrefsListener objects @@ -418,14 +419,14 @@ private: /// Return the config file key associated with a warning dialog identified /// by internalDialogName. When the box is checked, the value at the key /// becomes false. -AUDACITY_DLL_API +PREFERENCES_API wxString WarningDialogKey(const wxString &internalDialogName); -/* +/*! Meant to be statically constructed. A callback to repopulate configuration files after a reset. */ -struct AUDACITY_DLL_API PreferenceInitializer { +struct PREFERENCES_API PreferenceInitializer { PreferenceInitializer(); virtual ~PreferenceInitializer(); virtual void operator () () = 0; @@ -434,6 +435,6 @@ struct AUDACITY_DLL_API PreferenceInitializer { }; // Special extra-sticky settings -extern AUDACITY_DLL_API BoolSetting DefaultUpdatesCheckingFlag; +extern PREFERENCES_API BoolSetting DefaultUpdatesCheckingFlag; #endif diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index cad3d2998..1072e44cd 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -109,7 +109,7 @@ It handles initialization and termination by subclassing wxApp. #include "prefs/DirectoriesPrefs.h" #include "prefs/GUIPrefs.h" #include "tracks/ui/Scrubbing.h" -#include "widgets/FileConfig.h" +#include "FileConfig.h" #include "widgets/FileHistory.h" #include "update/UpdateManager.h" #include "widgets/wxWidgetsBasicUI.h" diff --git a/src/AudacityFileConfig.h b/src/AudacityFileConfig.h index 4fe079d61..8c6bf92d0 100644 --- a/src/AudacityFileConfig.h +++ b/src/AudacityFileConfig.h @@ -13,7 +13,7 @@ Paul Licameli split from Prefs.h #define __AUDACITY_FILE_CONFIG__ #include -#include "widgets/FileConfig.h" // to inherit +#include "FileConfig.h" // to inherit /// \brief Our own specialisation of FileConfig. class AUDACITY_DLL_API AudacityFileConfig final : public FileConfig diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41e280f03..9877f076f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -200,8 +200,6 @@ list( APPEND SOURCES PluginManager.h PluginRegistrationDialog.cpp PluginRegistrationDialog.h - Prefs.cpp - Prefs.h Printing.cpp Printing.h Profiler.cpp @@ -916,8 +914,6 @@ list( APPEND SOURCES widgets/ErrorDialog.h widgets/ExpandingToolBar.cpp widgets/ExpandingToolBar.h - widgets/FileConfig.cpp - widgets/FileConfig.h widgets/FileDialog/FileDialog.cpp widgets/FileDialog/FileDialog.h $<$: diff --git a/src/ProjectSettings.h b/src/ProjectSettings.h index b3ef3d71f..d46e4f9f3 100644 --- a/src/ProjectSettings.h +++ b/src/ProjectSettings.h @@ -16,6 +16,7 @@ Paul Licameli split from AudacityProject.h #include "ClientData.h" // to inherit #include "Prefs.h" // to inherit +#include "audacity/Types.h" class AudacityProject; diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h index c9fafbd5f..aa244b130 100644 --- a/src/commands/CommandManager.h +++ b/src/commands/CommandManager.h @@ -20,7 +20,7 @@ #include "Keyboard.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Registry.h" #include diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp index fdee3bd34..722e31ca0 100644 --- a/src/commands/GetInfoCommand.cpp +++ b/src/commands/GetInfoCommand.cpp @@ -192,7 +192,7 @@ bool GetInfoCommand::SendMenus(const CommandContext &context) return true; } -#include "../Prefs.h" +#include "Prefs.h" namespace { diff --git a/src/commands/LoadCommands.cpp b/src/commands/LoadCommands.cpp index 55fe19078..8391d65a1 100644 --- a/src/commands/LoadCommands.cpp +++ b/src/commands/LoadCommands.cpp @@ -18,7 +18,7 @@ modelled on BuiltinEffectsModule #include "AudacityCommand.h" #include "ModuleManager.h" -#include "../Prefs.h" +#include "Prefs.h" namespace { bool sInitialized = false; diff --git a/src/commands/PreferenceCommands.cpp b/src/commands/PreferenceCommands.cpp index a5ecc4727..0bdffeae5 100644 --- a/src/commands/PreferenceCommands.cpp +++ b/src/commands/PreferenceCommands.cpp @@ -19,7 +19,7 @@ SetPreferenceCommand classes #include "PreferenceCommands.h" #include "LoadCommands.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../commands/CommandContext.h" diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index 2deb00521..b06ba245c 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -37,7 +37,7 @@ small calculations of rectangles. #include "../TrackPanel.h" #include "../effects/Effect.h" #include "../toolbars/ToolManager.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ProjectWindow.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index e75e85fb4..927091823 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -29,7 +29,7 @@ #include "../AColor.h" #include "../AllThemeResources.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../Theme.h" diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index 8d9b8518c..48c346472 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -28,7 +28,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index b37c52db6..a13b3717d 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -24,7 +24,7 @@ #include #include "../LabelTrack.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Resample.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 8d0ba6526..e4304e8db 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -34,7 +34,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/AudacityMessageBox.h" diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index c92f78a94..b7d73fc68 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -38,7 +38,7 @@ #include #include "../AColor.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../Theme.h" diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp index d7d7da3fc..ad76f5046 100644 --- a/src/effects/Contrast.cpp +++ b/src/effects/Contrast.cpp @@ -14,7 +14,7 @@ #include "../CommonCommandFlags.h" #include "../WaveTrack.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectFileIO.h" #include "../ProjectSettings.h" diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index 6c1d9eeac..198e0657b 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -40,7 +40,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 084674bea..d6d55a1fe 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -23,7 +23,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/NumericTextCtrl.h" diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 54fac712a..d453eceff 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -95,7 +95,7 @@ #include "../Envelope.h" #include "../EnvelopeEditor.h" #include "../FFT.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../Theme.h" #include "../TrackArtist.h" diff --git a/src/effects/Generator.cpp b/src/effects/Generator.cpp index 1889dac9c..2c0b413e6 100644 --- a/src/effects/Generator.cpp +++ b/src/effects/Generator.cpp @@ -17,7 +17,7 @@ #include "Generator.h" #include "../Project.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ViewInfo.h" #include "../WaveTrack.h" #include "../prefs/TracksBehaviorsPrefs.h" diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp index cfe8208a9..447021b0b 100644 --- a/src/effects/LoadEffects.cpp +++ b/src/effects/LoadEffects.cpp @@ -14,7 +14,7 @@ #include "LoadEffects.h" -#include "../Prefs.h" +#include "Prefs.h" #include "Effect.h" #include "ModuleManager.h" diff --git a/src/effects/Loudness.cpp b/src/effects/Loudness.cpp index 8cb81e170..a6389b42d 100644 --- a/src/effects/Loudness.cpp +++ b/src/effects/Loudness.cpp @@ -24,7 +24,7 @@ #include #include "Internat.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ProjectFileManager.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index fb08cfb88..8aa6a5445 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -24,7 +24,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 9215f9fc8..8b05bee70 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -45,7 +45,7 @@ #include "../ShuttleGui.h" #include "../widgets/HelpSystem.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../RealFFTf.h" #include "../WaveTrack.h" diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index e5aad0ef4..c434307c2 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -26,7 +26,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ProjectFileManager.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 5dd1b781c..7a275d1ba 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -31,7 +31,7 @@ #include "../FFT.h" #include "../widgets/valnum.h" #include "../widgets/AudacityMessageBox.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../WaveTrack.h" diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index c588654e3..ae3e02179 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -24,7 +24,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index cf61f32a8..19f7c7c52 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -55,7 +55,7 @@ a graph for EffectScienFilter. #include "../AColor.h" #include "../AllThemeResources.h" #include "../PlatformCompatibility.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../Shuttle.h" #include "../ShuttleGui.h" diff --git a/src/effects/ScoreAlignDialog.cpp b/src/effects/ScoreAlignDialog.cpp index aa98491a7..16b12f191 100644 --- a/src/effects/ScoreAlignDialog.cpp +++ b/src/effects/ScoreAlignDialog.cpp @@ -42,7 +42,7 @@ It \TODO: description #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../lib-src/header-substitutes/allegro.h" #include "audioreader.h" diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index bd7878df3..951d1be1a 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -28,7 +28,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectSettings.h" #include "../Shuttle.h" diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 0c98a509a..e9519ca17 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -70,7 +70,7 @@ effects from this one class. #include "../../WaveTrack.h" #include "../../widgets/valnum.h" #include "../../widgets/AudacityMessageBox.h" -#include "../../Prefs.h" +#include "Prefs.h" #include "../../wxFileNameWrapper.h" #include "../../prefs/GUIPrefs.h" #include "../../tracks/playabletrack/wavetrack/ui/WaveTrackView.h" diff --git a/src/export/Export.cpp b/src/export/Export.cpp index 5adecb44d..45f370abb 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -54,7 +54,7 @@ #include "../src/AllThemeResources.h" #include "BasicUI.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../prefs/ImportExportPrefs.h" #include "../Project.h" #include "../ProjectHistory.h" diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index 976a885a9..236a1c98e 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -31,7 +31,7 @@ #include "Export.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../Tags.h" #include "../Track.h" diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index f7197d3ad..98efdf030 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -32,7 +32,7 @@ and libvorbis examples, Monty #include "../float_cast.h" #include "../ProjectSettings.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../Tags.h" diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index 74935d400..15956f5a0 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -49,7 +49,7 @@ #include "Export.h" #include "../FileIO.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ProjectSettings.h" #include "../ShuttleGui.h" #include "../Tags.h" diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index 3278c6668..4c998e054 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -82,7 +82,7 @@ #include "../FileNames.h" #include "../float_cast.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ProjectSettings.h" #include "../ProjectWindow.h" #include "../ShuttleGui.h" diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index 69f186a16..7224cd2af 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -43,7 +43,7 @@ #include "../Project.h" #include "../ProjectSettings.h" #include "../ProjectWindow.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../SelectionState.h" #include "../ShuttleGui.h" #include "../Tags.h" diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index c14ed4b47..d623f5264 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -30,7 +30,7 @@ #include "../FileIO.h" #include "../ProjectSettings.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../Tags.h" diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index e40a40799..a7fffd279 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -26,7 +26,7 @@ #include "../FileFormats.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ProjectSettings.h" #include "../ShuttleGui.h" #include "../Tags.h" diff --git a/src/import/Import.cpp b/src/import/Import.cpp index 38aebaac8..d0286ff66 100644 --- a/src/import/Import.cpp +++ b/src/import/Import.cpp @@ -55,7 +55,7 @@ ImportLOF.cpp, and ImportAUP.cpp. #include "../Project.h" #include "../WaveTrack.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/ImportAUP.cpp b/src/import/ImportAUP.cpp index 063936c37..e0edc9ff2 100644 --- a/src/import/ImportAUP.cpp +++ b/src/import/ImportAUP.cpp @@ -29,7 +29,7 @@ #if defined(USE_MIDI) #include "../NoteTrack.h" #endif -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectFileIO.h" #include "../ProjectFileManager.h" diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp index 26e41bad2..f0f4b4f54 100644 --- a/src/import/ImportFLAC.cpp +++ b/src/import/ImportFLAC.cpp @@ -67,7 +67,7 @@ static Importer::RegisteredUnusableImportPlugin registered{ #include "FLAC++/decoder.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../WaveTrack.h" #include "ImportPlugin.h" diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp index a9ca369bc..bc5615ada 100644 --- a/src/import/ImportLOF.cpp +++ b/src/import/ImportLOF.cpp @@ -88,7 +88,7 @@ #include "../ProjectHistory.h" #include "../ProjectManager.h" #include "../ProjectWindow.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index ada70971f..68f5e8636 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -62,7 +62,7 @@ static Importer::RegisteredUnusableImportPlugin registered #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Tags.h" #include "../WaveTrack.h" #include "../widgets/AudacityMessageBox.h" diff --git a/src/import/ImportOGG.cpp b/src/import/ImportOGG.cpp index c9db94c1d..17b24af52 100644 --- a/src/import/ImportOGG.cpp +++ b/src/import/ImportOGG.cpp @@ -39,7 +39,7 @@ #include #include "Import.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Tags.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp index 4daa57b95..fe9f7a612 100644 --- a/src/import/ImportPCM.cpp +++ b/src/import/ImportPCM.cpp @@ -45,7 +45,7 @@ #endif #include "../FileFormats.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "ImportPlugin.h" diff --git a/src/import/ImportRaw.cpp b/src/import/ImportRaw.cpp index 0a8801d8c..be6897d3b 100644 --- a/src/import/ImportRaw.cpp +++ b/src/import/ImportRaw.cpp @@ -28,7 +28,7 @@ and sample size to help you importing data of an unknown format. #include "../AudioIOBase.h" #include "../FileFormats.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ProjectSettings.h" #include "../ShuttleGui.h" #include "UserException.h" diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp index d0f0c889d..e29586721 100644 --- a/src/menus/EditMenus.cpp +++ b/src/menus/EditMenus.cpp @@ -5,7 +5,7 @@ #include "../LabelTrack.h" #include "../Menus.h" #include "../NoteTrack.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectHistory.h" #include "../ProjectSettings.h" diff --git a/src/menus/ExtraMenus.cpp b/src/menus/ExtraMenus.cpp index c779c2f2c..5dcb70af7 100644 --- a/src/menus/ExtraMenus.cpp +++ b/src/menus/ExtraMenus.cpp @@ -1,6 +1,6 @@ #include "../CommonCommandFlags.h" #include "../Menus.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../commands/CommandContext.h" #include "../commands/CommandManager.h" diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp index 3f8c73180..90a011303 100644 --- a/src/menus/FileMenus.cpp +++ b/src/menus/FileMenus.cpp @@ -4,7 +4,7 @@ #include "../FileNames.h" #include "../LabelTrack.h" #include "../NoteTrack.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Printing.h" #include "../Project.h" #include "../ProjectFileIO.h" diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp index ddfd3252f..b9d4dd9c1 100644 --- a/src/menus/HelpMenus.cpp +++ b/src/menus/HelpMenus.cpp @@ -13,7 +13,7 @@ #include "../FileNames.h" #include "../HelpText.h" #include "../Menus.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectSelectionManager.h" #include "../ShuttleGui.h" diff --git a/src/menus/LabelMenus.cpp b/src/menus/LabelMenus.cpp index 2d33b33f0..773926c71 100644 --- a/src/menus/LabelMenus.cpp +++ b/src/menus/LabelMenus.cpp @@ -3,7 +3,7 @@ #include "../CommonCommandFlags.h" #include "../LabelTrack.h" #include "../Menus.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectAudioIO.h" #include "../ProjectHistory.h" diff --git a/src/menus/NavigationMenus.cpp b/src/menus/NavigationMenus.cpp index 84bc0d97e..26143bc47 100644 --- a/src/menus/NavigationMenus.cpp +++ b/src/menus/NavigationMenus.cpp @@ -1,7 +1,7 @@ #include "../CommonCommandFlags.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectHistory.h" #include "../ProjectWindow.h" diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp index 7dd2b99a1..bf1796cf6 100644 --- a/src/menus/PluginMenus.cpp +++ b/src/menus/PluginMenus.cpp @@ -7,7 +7,7 @@ #include "../Menus.h" #include "../PluginManager.h" #include "../PluginRegistrationDialog.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectSettings.h" #include "../ProjectWindow.h" diff --git a/src/menus/SelectMenus.cpp b/src/menus/SelectMenus.cpp index 00c6ce68d..63b1a8fd5 100644 --- a/src/menus/SelectMenus.cpp +++ b/src/menus/SelectMenus.cpp @@ -4,7 +4,7 @@ #include "../AudioIO.h" #include "../CommonCommandFlags.h" #include "../SpectrumAnalyst.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectAudioIO.h" #include "../ProjectAudioManager.h" diff --git a/src/menus/TrackMenus.cpp b/src/menus/TrackMenus.cpp index c38043880..179ecf519 100644 --- a/src/menus/TrackMenus.cpp +++ b/src/menus/TrackMenus.cpp @@ -5,7 +5,7 @@ #include "../Menus.h" #include "../Mix.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectAudioIO.h" #include "../ProjectHistory.h" diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index d9adcf937..337010e05 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -6,7 +6,7 @@ #include "../DeviceManager.h" #include "../LabelTrack.h" #include "../Menus.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectAudioIO.h" #include "../ProjectAudioManager.h" diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp index 9a6d40d2b..7d6de5e08 100644 --- a/src/menus/ViewMenus.cpp +++ b/src/menus/ViewMenus.cpp @@ -1,6 +1,6 @@ #include "../CommonCommandFlags.h" #include "../Menus.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectHistory.h" #include "../ProjectSettings.h" diff --git a/src/prefs/ApplicationPrefs.cpp b/src/prefs/ApplicationPrefs.cpp index 97d154c39..996d7ab98 100644 --- a/src/prefs/ApplicationPrefs.cpp +++ b/src/prefs/ApplicationPrefs.cpp @@ -21,7 +21,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "ui/AccessibleLinksFormatter.h" diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp index c0332c89a..afe22af73 100644 --- a/src/prefs/BatchPrefs.cpp +++ b/src/prefs/BatchPrefs.cpp @@ -22,7 +22,7 @@ setting used in debugging batch (aka macros) processing. #include #include "Languages.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" BEGIN_EVENT_TABLE(BatchPrefs, PrefsPanel) diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index b6fb3dab2..997532905 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -37,7 +37,7 @@ other settings. #include "portaudio.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../DeviceManager.h" diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp index 0d5064e67..1b85354aa 100644 --- a/src/prefs/DirectoriesPrefs.cpp +++ b/src/prefs/DirectoriesPrefs.cpp @@ -32,7 +32,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../TempDirectory.h" #include "../widgets/AudacityMessageBox.h" diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index d1eeaaae2..4b804d76c 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -25,7 +25,7 @@ #include "Languages.h" #include "../PluginManager.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" EffectsPrefs::EffectsPrefs(wxWindow * parent, wxWindowID winid) diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index 29310c011..ffe6e5468 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -21,7 +21,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../import/Import.h" #include "../widgets/AudacityMessageBox.h" diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index b5e531ceb..04d614291 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -26,7 +26,7 @@ #include "../FileNames.h" #include "Languages.h" #include "../Theme.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "GUISettings.h" diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp index e573969f4..fedccd6f2 100644 --- a/src/prefs/ImportExportPrefs.cpp +++ b/src/prefs/ImportExportPrefs.cpp @@ -20,7 +20,7 @@ #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" ImportExportPrefs::ImportExportPrefs(wxWindow * parent, wxWindowID winid) diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 616c3411c..28beb3255 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -34,7 +34,7 @@ KeyConfigPrefs and MousePrefs use. #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../commands/CommandManager.h" #include "../xml/XMLFileReader.h" diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 151bd0ab3..7399c16b1 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -36,7 +36,7 @@ other settings. #include "../../lib-src/portmidi/pm_common/portmidi.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../widgets/AudacityMessageBox.h" diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp index bee5f0013..25121cb91 100644 --- a/src/prefs/ModulePrefs.cpp +++ b/src/prefs/ModulePrefs.cpp @@ -25,7 +25,7 @@ with names like mod-script-pipe that add NEW features. #include "../ShuttleGui.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ModuleSettings.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp index a33f3502c..c705a0067 100644 --- a/src/prefs/MousePrefs.cpp +++ b/src/prefs/MousePrefs.cpp @@ -39,7 +39,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" // The numbers of the columns of the mList. diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp index 04f235f3f..6a44cc3ee 100644 --- a/src/prefs/PlaybackPrefs.cpp +++ b/src/prefs/PlaybackPrefs.cpp @@ -25,7 +25,7 @@ #include #include "../ShuttleGui.h" -#include "../Prefs.h" +#include "Prefs.h" PlaybackPrefs::PlaybackPrefs(wxWindow * parent, wxWindowID winid) : PrefsPanel(parent, winid, XO("Playback")) diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp index 50b1c6df4..8b432e88a 100644 --- a/src/prefs/PrefsDialog.cpp +++ b/src/prefs/PrefsDialog.cpp @@ -35,7 +35,7 @@ #include #include "../AudioIOBase.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../commands/CommandManager.h" diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp index d9698c4cc..1357c6611 100644 --- a/src/prefs/QualityPrefs.cpp +++ b/src/prefs/QualityPrefs.cpp @@ -25,7 +25,7 @@ #include "../AudioIOBase.h" #include "../Dither.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Resample.h" #include "../ShuttleGui.h" diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 93b8f4a41..d7c66a1c6 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -27,7 +27,7 @@ #include #include "../prefs/GUISettings.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" using std::min; diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index 53499bb07..66ecc675e 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -22,7 +22,7 @@ Paul Licameli #include #include "../FFT.h" -#include "../Prefs.h" +#include "Prefs.h" #include diff --git a/src/prefs/SpectrogramSettings.h b/src/prefs/SpectrogramSettings.h index 5eedd5f0f..b1d7e7495 100644 --- a/src/prefs/SpectrogramSettings.h +++ b/src/prefs/SpectrogramSettings.h @@ -11,7 +11,7 @@ Paul Licameli #ifndef __AUDACITY_SPECTROGRAM_SETTINGS__ #define __AUDACITY_SPECTROGRAM_SETTINGS__ -#include "../Prefs.h" +#include "Prefs.h" #include "../SampleFormat.h" #include "../RealFFTf.h" diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp index cd3e81907..031f2552a 100644 --- a/src/prefs/ThemePrefs.cpp +++ b/src/prefs/ThemePrefs.cpp @@ -33,7 +33,7 @@ Provides: #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Theme.h" #include "../ShuttleGui.h" #include "../AColor.h" diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 3f01c3701..ff24b2ce0 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -17,7 +17,7 @@ #include "TracksBehaviorsPrefs.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" TracksBehaviorsPrefs::TracksBehaviorsPrefs(wxWindow * parent, wxWindowID winid) diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index 39b1dcb63..597a0ae27 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -23,7 +23,7 @@ //#include //#include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h" diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp index 3d29594c8..5a2c879da 100644 --- a/src/prefs/WarningsPrefs.cpp +++ b/src/prefs/WarningsPrefs.cpp @@ -22,7 +22,7 @@ #include -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/prefs/WaveformSettings.cpp b/src/prefs/WaveformSettings.cpp index 6018a42cc..ce749f5a4 100644 --- a/src/prefs/WaveformSettings.cpp +++ b/src/prefs/WaveformSettings.cpp @@ -23,7 +23,7 @@ Paul Licameli #include #include -#include "../Prefs.h" +#include "Prefs.h" WaveformSettings::Globals::Globals() diff --git a/src/prefs/WaveformSettings.h b/src/prefs/WaveformSettings.h index 3051fc82a..67d0f4bd1 100644 --- a/src/prefs/WaveformSettings.h +++ b/src/prefs/WaveformSettings.h @@ -11,7 +11,7 @@ Paul Licameli #ifndef __AUDACITY_WAVEFORM_SETTINGS__ #define __AUDACITY_WAVEFORM_SETTINGS__ -#include "../Prefs.h" +#include "Prefs.h" class EnumValueSymbols; diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 994d2be25..d371f9e46 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -58,7 +58,7 @@ #include "../AllThemeResources.h" #include "../AudioIO.h" #include "../ImageManipulation.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectAudioIO.h" #include "../ProjectAudioManager.h" diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp index ab1e3b730..c783ee408 100644 --- a/src/toolbars/DeviceToolBar.cpp +++ b/src/toolbars/DeviceToolBar.cpp @@ -42,7 +42,7 @@ #include "../AudioIOBase.h" #include "../ImageManipulation.h" #include "../KeyboardCapture.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ShuttleGui.h" #include "../widgets/Grabber.h" diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp index 4143a5b33..8d01b380e 100644 --- a/src/toolbars/EditToolBar.cpp +++ b/src/toolbars/EditToolBar.cpp @@ -51,7 +51,7 @@ #include "../BatchCommands.h" #include "../ImageManipulation.h" #include "../Menus.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../UndoManager.h" #include "../widgets/AButton.h" diff --git a/src/toolbars/MixerToolBar.cpp b/src/toolbars/MixerToolBar.cpp index de0c4fff0..dc39b68d5 100644 --- a/src/toolbars/MixerToolBar.cpp +++ b/src/toolbars/MixerToolBar.cpp @@ -38,7 +38,7 @@ #include "../AudioIO.h" #include "../ImageManipulation.h" #include "../KeyboardCapture.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../widgets/ASlider.h" #include "../widgets/Grabber.h" diff --git a/src/toolbars/ScrubbingToolBar.cpp b/src/toolbars/ScrubbingToolBar.cpp index 5fe9ec61d..3be1167c0 100644 --- a/src/toolbars/ScrubbingToolBar.cpp +++ b/src/toolbars/ScrubbingToolBar.cpp @@ -33,7 +33,7 @@ #include "../AdornedRulerPanel.h" #include "../AllThemeResources.h" #include "../ImageManipulation.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../UndoManager.h" #include "../widgets/AButton.h" #include "../tracks/ui/Scrubbing.h" diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index bf0349dda..5481e3bcf 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -54,7 +54,7 @@ with changes in the SelectionBar. #include "../AudioIO.h" #include "../AColor.h" #include "../KeyboardCapture.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../ProjectAudioIO.h" #include "../ProjectSettings.h" diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index 40b8e80a3..bd8503e26 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -53,7 +53,7 @@ with changes in the SpectralSelectionBar. #endif #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../AllThemeResources.h" #include "../SelectedRegion.h" diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp index 067ad590f..5bf62ca2e 100644 --- a/src/toolbars/ToolBar.cpp +++ b/src/toolbars/ToolBar.cpp @@ -53,7 +53,7 @@ in which buttons can be placed. #include "../commands/CommandManager.h" #include "../widgets/AButton.h" #include "../widgets/Grabber.h" -#include "../Prefs.h" +#include "Prefs.h" //////////////////////////////////////////////////////////// /// ToolBarResizer diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h index 619732268..288443d5b 100644 --- a/src/toolbars/ToolBar.h +++ b/src/toolbars/ToolBar.h @@ -17,7 +17,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" #include "../Theme.h" #include "../widgets/wxPanelWrapper.h" // to inherit #include diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index 705bf874d..eeef42016 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -45,7 +45,7 @@ #include "../AColor.h" #include "../AllThemeResources.h" #include "../ImageManipulation.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../widgets/Grabber.h" const ToolBarConfiguration::Position diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index a4516a10a..d5cfa2d64 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -55,7 +55,7 @@ #include "../AColor.h" #include "../AllThemeResources.h" #include "../ImageManipulation.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../Project.h" #include "../widgets/AButton.h" #include "../widgets/ASlider.h" diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp index 87738418c..574ae8c4d 100644 --- a/src/toolbars/ToolsToolBar.cpp +++ b/src/toolbars/ToolsToolBar.cpp @@ -47,7 +47,7 @@ #endif #include -#include "../Prefs.h" +#include "Prefs.h" #include "../AllThemeResources.h" #include "../ImageManipulation.h" #include "../Project.h" diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index 28b2f8521..51160f7bd 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -44,7 +44,7 @@ #include "../widgets/AButton.h" #include "../widgets/ASlider.h" #include "../tracks/ui/Scrubbing.h" -#include "../Prefs.h" +#include "Prefs.h" #ifdef EXPERIMENTAL_VOICE_DETECTION #include "../VoiceKey.h" diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.cpp b/src/tracks/labeltrack/ui/LabelTrackControls.cpp index 3d5d07bf5..43bda6fbd 100644 --- a/src/tracks/labeltrack/ui/LabelTrackControls.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackControls.cpp @@ -15,7 +15,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../HitTestResult.h" #include "../../../LabelTrack.h" #include "../../../widgets/PopupMenuTable.h" -#include "../../../Prefs.h" +#include "Prefs.h" #include "../../../RefreshCode.h" #include "../../../ShuttleGui.h" #include "../../../widgets/wxPanelWrapper.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp index 4af3819d9..fb1e2ebb5 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -23,7 +23,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../TrackPanelMouseEvent.h" #include "../../../../widgets/PopupMenuTable.h" #include "../../../../../images/Cursors.h" -#include "../../../../Prefs.h" +#include "Prefs.h" #include diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp index 000ff2daa..cb19802cb 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp @@ -15,7 +15,7 @@ Paul Licameli split from WaveTrackVZoomHandle.cpp #include "../../../../HitTestResult.h" #include "../../../../NumberScale.h" -#include "../../../../Prefs.h" +#include "Prefs.h" #include "../../../../ProjectHistory.h" #include "../../../../RefreshCode.h" #include "../../../../TrackPanelMouseEvent.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp index 0cc5adea5..6666c56dc 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp @@ -16,7 +16,7 @@ Paul Licameli split from WaveTrackView.cpp #include "WaveTrackViewConstants.h" #include "../../../../AColor.h" -#include "../../../../Prefs.h" +#include "Prefs.h" #include "../../../../NumberScale.h" #include "../../../../TrackArtist.h" #include "../../../../TrackPanelDrawingContext.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h index 5ac4b51d0..08b3eb911 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h @@ -16,7 +16,7 @@ class PopupMenuTable; class WaveTrack; #include "WaveTrackViewConstants.h" #include "../../../../UIHandle.h" -#include "../../../../Prefs.h" +#include "Prefs.h" namespace WaveTrackVZoomHandle { diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp index f581c4c8c..a37a1963e 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp @@ -15,7 +15,7 @@ Paul Licameli split from WaveTrackVZoomHandle.cpp #include "../../../../HitTestResult.h" #include "../../../../NumberScale.h" -#include "../../../../Prefs.h" +#include "Prefs.h" #include "../../../../ProjectHistory.h" #include "../../../../RefreshCode.h" #include "../../../../TrackPanelMouseEvent.h" diff --git a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp index 74ee41777..5a8dc9801 100644 --- a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp +++ b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp @@ -15,7 +15,7 @@ Paul Licameli split from TimeTrackVZoomHandle.cpp #include "../../../HitTestResult.h" #include "../../../NumberScale.h" -#include "../../../Prefs.h" +#include "Prefs.h" #include "../../../ProjectHistory.h" #include "../../../RefreshCode.h" #include "../../../TrackPanelMouseEvent.h" diff --git a/src/tracks/ui/Scrubbing.h b/src/tracks/ui/Scrubbing.h index 4175de23d..d929615b2 100644 --- a/src/tracks/ui/Scrubbing.h +++ b/src/tracks/ui/Scrubbing.h @@ -18,7 +18,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../AudioIOBase.h" // for ScrubbingOptions #include "../../ClientData.h" // to inherit -#include "../../Prefs.h" // to inherit +#include "Prefs.h" // to inherit #include "../../widgets/Overlay.h" // to inherit #include "../../commands/CommandContext.h" #include "../../commands/CommandManager.h" // for MenuTable diff --git a/src/widgets/ErrorDialog.cpp b/src/widgets/ErrorDialog.cpp index 7c4271ef2..6d5714c93 100644 --- a/src/widgets/ErrorDialog.cpp +++ b/src/widgets/ErrorDialog.cpp @@ -37,7 +37,7 @@ #include "CodeConversions.h" #include "../ShuttleGui.h" #include "../HelpText.h" -#include "../Prefs.h" +#include "Prefs.h" #include "HelpSystem.h" BEGIN_EVENT_TABLE(ErrorDialog, wxDialogWrapper) diff --git a/src/widgets/FileHistory.cpp b/src/widgets/FileHistory.cpp index cd78e1c8b..14a5fbf94 100644 --- a/src/widgets/FileHistory.cpp +++ b/src/widgets/FileHistory.cpp @@ -20,7 +20,7 @@ #include #include "Internat.h" -#include "../Prefs.h" +#include "Prefs.h" #include diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index 315e1c521..eddec332b 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -43,7 +43,7 @@ #include "../ShuttleGui.h" #include "../Theme.h" #include "../HelpText.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../wxFileNameWrapper.h" #include "../prefs/GUIPrefs.h" diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index e5cfef4da..890db532b 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -67,7 +67,7 @@ #include "../Project.h" #include "../ProjectAudioManager.h" #include "../ProjectStatus.h" -#include "../Prefs.h" +#include "Prefs.h" #include "../ShuttleGui.h" #include "../Theme.h" diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h index ddcbc51d3..2c22c3020 100644 --- a/src/widgets/Meter.h +++ b/src/widgets/Meter.h @@ -22,7 +22,7 @@ #include // member variable #include "../SampleFormat.h" -#include "../Prefs.h" +#include "Prefs.h" #include "MeterPanelBase.h" // to inherit #include "Ruler.h" // member variable diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp index a5064be23..c5f0ab8ca 100644 --- a/src/widgets/ProgressDialog.cpp +++ b/src/widgets/ProgressDialog.cpp @@ -50,7 +50,7 @@ #include #include -#include "../Prefs.h" +#include "Prefs.h" // This really should be a Preferences setting static const unsigned char beep[] =