diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index c83f7101f..06b124db7 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -101,6 +101,8 @@ It handles initialization and termination by subclassing wxApp. #include "import/Import.h" +#include "Experimental.h" + #if defined(EXPERIMENTAL_CRASH_REPORT) #include #include diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp index 16c96a0e3..ac8ad6a2d 100644 --- a/src/AudacityLogger.cpp +++ b/src/AudacityLogger.cpp @@ -26,6 +26,7 @@ Provides thread-safe logging based on the wxWidgets log facility. #include #include "../images/AudacityLogoAlpha.xpm" +#include "Experimental.h" // // AudacityLogger class diff --git a/src/DeviceChange.cpp b/src/DeviceChange.cpp index 07cd0b3a1..4c057913a 100644 --- a/src/DeviceChange.cpp +++ b/src/DeviceChange.cpp @@ -15,6 +15,8 @@ #include "DeviceChange.h" +#include "Experimental.h" + #if defined(EXPERIMENTAL_DEVICE_CHANGE_HANDLER) #if defined(HAVE_DEVICE_CHANGE) diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp index f1675dabd..8f3ee7c54 100644 --- a/src/DeviceManager.cpp +++ b/src/DeviceManager.cpp @@ -37,6 +37,8 @@ #include "DeviceManager.h" #include "toolbars/DeviceToolBar.h" +#include "Experimental.h" + DeviceManager DeviceManager::dm; /// Gets the singleton instance diff --git a/src/Diags.cpp b/src/Diags.cpp index 78f0613e8..67860466f 100644 --- a/src/Diags.cpp +++ b/src/Diags.cpp @@ -36,7 +36,6 @@ count down so that we track how many times the event happens. #include #include "Diags.h" -#include "Experimental.h" static wxStopWatch MasterWatch; static bool bStopWatchStarted = false; diff --git a/src/FFT.cpp b/src/FFT.cpp index 00922d2bc..62408eed4 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -46,6 +46,8 @@ #include #include +#include "Experimental.h" + static int **gFFTBitTable = NULL; static const int MaxFastBits = 16; diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index aaaedf3d8..ac455eff7 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -26,6 +26,8 @@ License: GPL v2. See License.txt. #include +#include "Experimental.h" + #if !defined(USE_FFMPEG) /// FFmpeg support may or may not be compiled in, /// but Preferences dialog requires this function nevertheless diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp index b520e482e..70d682cfe 100644 --- a/src/FreqWindow.cpp +++ b/src/FreqWindow.cpp @@ -80,6 +80,8 @@ and in the spectrogram spectral selection. #include "WaveTrack.h" +#include "Experimental.h" + DEFINE_EVENT_TYPE(EVT_FREQWINDOW_RECALC); enum { diff --git a/src/LyricsWindow.cpp b/src/LyricsWindow.cpp index 7d2acad4e..c25bf7e87 100644 --- a/src/LyricsWindow.cpp +++ b/src/LyricsWindow.cpp @@ -9,8 +9,6 @@ **********************************************************************/ -#include "Experimental.h" - #include "LyricsWindow.h" #include "Lyrics.h" #include "AudioIO.h" diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index 1304ed52a..27887b628 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -47,6 +47,8 @@ i.e. an alternative to the usual interface, for Audacity. #include +#include "Experimental.h" + #define initFnName "ExtensionModuleInit" #define versionFnName "GetVersionString" #define scriptFnName "RegScriptServerFunc" diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index b3a5bef23..d6f4f9c39 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -33,6 +33,8 @@ #include "Prefs.h" #include "effects/TimeWarper.h" +#include "Experimental.h" + #ifdef SONIFY #include "portmidi.h" diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index d18a4aa35..6fe098c33 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -48,6 +48,8 @@ #include +#include "Experimental.h" + WX_DECLARE_STRING_HASH_MAP(wxArrayString, ProviderMap); // ============================================================================ diff --git a/src/Printing.cpp b/src/Printing.cpp index a8db2aa1d..5f382828d 100644 --- a/src/Printing.cpp +++ b/src/Printing.cpp @@ -30,6 +30,8 @@ #include "WaveTrack.h" #include "widgets/Ruler.h" +#include "Experimental.h" + // Globals, so that we remember settings from session to session static wxPrintData *gPrintData = NULL; static wxPageSetupData *gPageSetupData = NULL; diff --git a/src/SelectedRegion.cpp b/src/SelectedRegion.cpp index e3a3a939b..640ee7388 100644 --- a/src/SelectedRegion.cpp +++ b/src/SelectedRegion.cpp @@ -12,6 +12,7 @@ Paul Licameli #include "SelectedRegion.h" #include "xml/XMLWriter.h" +#include "Experimental.h" const wxChar *SelectedRegion::sDefaultT0Name = wxT("selStart"); const wxChar *SelectedRegion::sDefaultT1Name = wxT("selEnd"); diff --git a/src/Spectrum.cpp b/src/Spectrum.cpp index b80966a66..5f043a8e6 100644 --- a/src/Spectrum.cpp +++ b/src/Spectrum.cpp @@ -18,6 +18,8 @@ #include "Spectrum.h" #include "FFT.h" +#include "Experimental.h" + bool ComputeSpectrum(const float * data, int width, int windowSize, double WXUNUSED(rate), float *output, diff --git a/src/Track.cpp b/src/Track.cpp index 10cda80bf..62ec4bde6 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -26,6 +26,8 @@ and TimeTrack. #include "Project.h" #include "DirManager.h" +#include "Experimental.h" + #ifdef _MSC_VER //Disable truncation warnings #pragma warning( disable : 4786 ) diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 20ca2e8db..f42040e51 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -183,6 +183,8 @@ audio tracks. #include "Theme.h" #include "AllThemeResources.h" +#include "Experimental.h" + #undef PROFILE_WAVEFORM #ifdef PROFILE_WAVEFORM #ifdef __WXMSW__ diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp index 82a95b409..f55bb15e5 100644 --- a/src/WaveClip.cpp +++ b/src/WaveClip.cpp @@ -38,6 +38,9 @@ #include "prefs/SpectrogramSettings.h" #include + +#include "Experimental.h" + WX_DEFINE_LIST(WaveClipList); class WaveCache { diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 16eecb496..421800378 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -55,6 +55,8 @@ Track classes. #include "prefs/SpectrumPrefs.h" #include "prefs/WaveformPrefs.h" +#include "Experimental.h" + using std::max; #ifdef EXPERIMENTAL_OUTPUT_DISPLAY diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index c6956f265..77dfef18a 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -115,6 +115,8 @@ CommandManager. It holds the callback for one command. #include #endif +#include "../Experimental.h" + // Shared by all projects static class CommandManagerEventMonitor : public wxEventFilter { diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 1ee927498..578284497 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -54,6 +54,8 @@ greater use in future. #include #endif +#include "../Experimental.h" + static const int kDummyID = 20000; static const int kSaveAsID = 20001; static const int kImportID = 20002; diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp index 614f47f14..12302fe54 100644 --- a/src/effects/LoadEffects.cpp +++ b/src/effects/LoadEffects.cpp @@ -57,6 +57,8 @@ #include "ChangeTempo.h" #endif +#include "../Experimental.h" + // // Include the SoundTouch effects, if requested // diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index 271a2a114..48a83bf13 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -29,6 +29,7 @@ #include "../ShuttleGui.h" #include "../widgets/valnum.h" +#include "../Experimental.h" enum { diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index bd705c1a7..c498c9d56 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -28,6 +28,8 @@ #include "../ShuttleGui.h" #include "../widgets/valnum.h" +#include "../Experimental.h" + enum { ID_Freq = 10000, diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 3523e4d72..2bd3c8aa2 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -68,6 +68,8 @@ effects from this one class. #include #include +#include "../../Experimental.h" + enum { ID_Editor = 10000, diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp index f349b0f91..0b2c4109d 100644 --- a/src/import/ImportFFmpeg.cpp +++ b/src/import/ImportFFmpeg.cpp @@ -31,6 +31,8 @@ Licensed under the GNU General Public License v2 or later #include #endif +#include "../Experimental.h" + #define DESC _("FFmpeg-compatible files") diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index e8a36f1f8..60e2dbad1 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -29,6 +29,8 @@ #include "EffectsPrefs.h" +#include "../Experimental.h" + EffectsPrefs::EffectsPrefs(wxWindow * parent) : PrefsPanel(parent, _("Effects")) { diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index fb217f8f6..d87275282 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -29,6 +29,8 @@ #include "GUISettings.h" +#include "../Experimental.h" + GUIPrefs::GUIPrefs(wxWindow * parent) : PrefsPanel(parent, _("Interface")) { diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index ee3e90126..e2a0dafe5 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -29,6 +29,8 @@ MP3 and FFmpeg encoding libraries. #include "LibraryPrefs.h" +#include "../Experimental.h" + //////////////////////////////////////////////////////////////////////////////// #define ID_MP3_FIND_BUTTON 7001 diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 320bbb722..bfbe6c45e 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -30,6 +30,8 @@ #include "../Prefs.h" #include "../ShuttleGui.h" +#include "../Experimental.h" + using std::min; RecordingPrefs::RecordingPrefs(wxWindow * parent) diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index 4e3fcf7ea..431d790ec 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -27,6 +27,8 @@ Paul Licameli #include +#include "../Experimental.h" + SpectrogramSettings::Globals::Globals() { LoadPrefs(); diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index 7636dad2f..b6a4683b4 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -30,6 +30,8 @@ #include +#include "../Experimental.h" + SpectrumPrefs::SpectrumPrefs(wxWindow * parent, WaveTrack *wt) : PrefsPanel(parent, wt ? _("Spectrogram Settings") : _("Spectrograms")) , mWt(wt) diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index 6f350cdff..4c4115ffe 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -28,6 +28,8 @@ #include "../ShuttleGui.h" #include "../WaveTrack.h" +#include "../Experimental.h" + //////////////////////////////////////////////////////////////////////////////// TracksPrefs::TracksPrefs(wxWindow * parent) diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp index 9a77732b5..29eb7b785 100644 --- a/src/toolbars/EditToolBar.cpp +++ b/src/toolbars/EditToolBar.cpp @@ -56,6 +56,8 @@ #include "../UndoManager.h" #include "../widgets/AButton.h" +#include "../Experimental.h" + IMPLEMENT_CLASS(EditToolBar, ToolBar); const int BUTTON_WIDTH = 27; diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index e167c55ca..424eafc12 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -55,6 +55,8 @@ with changes in the SpectralSelectionBar. #include "../SelectedRegion.h" #include "../widgets/NumericTextCtrl.h" +#include "../Experimental.h" + #ifdef EXPERIMENTAL_SPECTRAL_EDITING IMPLEMENT_CLASS(SpectralSelectionBar, ToolBar); diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index dca67db9a..514b64d69 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -68,6 +68,8 @@ #include "../widgets/AButton.h" #include "../widgets/Grabber.h" +#include "../Experimental.h" + //////////////////////////////////////////////////////////// /// Methods for ToolFrame //////////////////////////////////////////////////////////// diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp index a25276e71..b6d425fff 100644 --- a/src/toolbars/ToolsToolBar.cpp +++ b/src/toolbars/ToolsToolBar.cpp @@ -58,6 +58,8 @@ #include "../Theme.h" #include "../widgets/AButton.h" +#include "../Experimental.h" + IMPLEMENT_CLASS(ToolsToolBar, ToolBar); ////////////////////////////////////////////////////////////