diff --git a/CMakeLists.txt b/CMakeLists.txt index be2646a05..91d3a686e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,6 +418,10 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" ) file( TO_NATIVE_PATH "${pkgdir}/tools/python.exe" PYTHON ) endif() +# define EXPERIMENTAL flags +# Do this before consistency checks for added third-party libraries +include( "src/Experimental.cmake" ) + # Add our children add_subdirectory( "cmake-proxies" ) add_subdirectory( "help" ) diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt index 42cfab4a5..e651766b6 100644 --- a/cmake-proxies/CMakeLists.txt +++ b/cmake-proxies/CMakeLists.txt @@ -147,8 +147,21 @@ addlib( libogg ogg LIBOGG NO YES "ogg >= 1.3.1" ) addlib( libvorbis vorbis LIBVORBIS NO YES "vorbis >= 1.3.3" "vorbisenc >= 1.3.3" "vorbisfile >= 1.3.3" ) addlib( libflac flac LIBFLAC NO YES "flac >= 1.3.1" "flac++ >= 1.3.1" ) addlib( lv2 lv2 LV2 NO YES "lilv-0 >= 0.24.6" "lv2 >= 1.16.0" "serd-0 >= 0.30.2" "sord-0 >= 0.16.4" "sratom-0 >= 0.6.4" "suil-0 >= 0.10.6" ) + addlib( portmidi midi MIDI NO YES "portmidi >= 0.1" ) +if (NOT USE_MIDI AND + "EXPERIMENTAL_MIDI_OUT" IN_LIST EXPERIMENTAL_OPTIONS_LIST ) + message(FATAL_ERROR "EXPERIMENTAL_MIDI_OUT requires USE_MIDI") +endif () + + addlib( portmixer portmixer PORTMIXER NO YES "" ) +if (NOT USE_PORTMIXER AND + "EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT" IN_LIST + EXPERIMENTAL_OPTIONS_LIST ) + message(FATAL_ERROR "EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT requires USE_PORTMIXER") +endif () + addlib( portsmf portsmf PORTSMF NO YES "portSMF >= 0.1" ) addlib( libsbsms sbsms SBSMS NO YES "sbsms >= 2.2.0" ) addlib( soundtouch soundtouch SOUNDTOUCH NO YES "soundtouch >= 1.7.1" ) diff --git a/src/AColor.cpp b/src/AColor.cpp index 2935d9062..2a5d5cf41 100644 --- a/src/AColor.cpp +++ b/src/AColor.cpp @@ -20,7 +20,7 @@ It is also a place to document colour usage policy in Audacity #include "Audacity.h" #include "AColor.h" -#include "Experimental.h" + #include #include diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 5e47f6652..5abc8a0ab 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -28,7 +28,7 @@ hold information about one contributor to Audacity. #include "Audacity.h" // for USE_* macros #include "AboutDialog.h" -#include "Experimental.h" + #include #include diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp index 64b948cc4..d88f28b9a 100644 --- a/src/AdornedRulerPanel.cpp +++ b/src/AdornedRulerPanel.cpp @@ -21,7 +21,7 @@ #include "Audacity.h" #include "AdornedRulerPanel.h" -#include "Experimental.h" + #include // for wxUSE_* macros #include diff --git a/src/AllThemeResources.h b/src/AllThemeResources.h index 2cfaf83fc..a5f3601f4 100644 --- a/src/AllThemeResources.h +++ b/src/AllThemeResources.h @@ -45,7 +45,7 @@ from there. Audacity will look for a file called "Pause.png". // we want to include it multiple times in Theme.cpp. #include "Audacity.h" -#include "Experimental.h" + #include "MacroMagic.h" #define XPMS_RETIRED diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index f540cb1a6..2a4090f07 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -18,7 +18,7 @@ It handles initialization and termination by subclassing wxApp. #include "Audacity.h" // This should always be included first; for USE_* macros and __UNIX__ #include "AudacityApp.h" -#include "Experimental.h" + #if 0 // This may be used to debug memory leaks. @@ -29,6 +29,7 @@ It handles initialization and termination by subclassing wxApp. #include // for wxUSE_* macros #include #include +#include #include #include #include @@ -76,7 +77,7 @@ It handles initialization and termination by subclassing wxApp. #include "AudioIO.h" #include "Benchmark.h" #include "Clipboard.h" -#include "CrashReport.h" +#include "CrashReport.h" // for HAS_CRASH_REPORT #include "commands/CommandHandler.h" #include "commands/AppCommandEvent.h" #include "widgets/ASlider.h" @@ -122,12 +123,6 @@ It handles initialization and termination by subclassing wxApp. #include "import/Import.h" -#if defined(EXPERIMENTAL_CRASH_REPORT) -#include -#include -#include -#endif - #ifdef EXPERIMENTAL_SCOREALIGN #include "effects/ScoreAlignDialog.h" #endif @@ -940,7 +935,7 @@ wxLanguageInfo userLangs[] = void AudacityApp::OnFatalException() { -#if defined(EXPERIMENTAL_CRASH_REPORT) +#if defined(HAS_CRASH_REPORT) CrashReport::Generate(wxDebugReport::Context_Exception); #endif @@ -1009,7 +1004,7 @@ AudacityApp::AudacityApp() { // Do not capture crashes in debug builds #if !defined(_DEBUG) -#if defined(EXPERIMENTAL_CRASH_REPORT) +#if defined(HAS_CRASH_REPORT) #if defined(wxUSE_ON_FATAL_EXCEPTION) && wxUSE_ON_FATAL_EXCEPTION wxHandleFatalExceptions(); #endif diff --git a/src/AudacityApp.h b/src/AudacityApp.h index de84c5dc6..b6a65ac83 100644 --- a/src/AudacityApp.h +++ b/src/AudacityApp.h @@ -17,15 +17,11 @@ #include "Audacity.h" #include "audacity/Types.h" -#include "Experimental.h" + #include // to inherit #include // member variable -#if defined(EXPERIMENTAL_CRASH_REPORT) -#include // for wxDebugReport::Context -#endif - #include "MemoryX.h" class wxSingleInstanceChecker; diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp index c94200d46..2551e8b82 100644 --- a/src/AudacityLogger.cpp +++ b/src/AudacityLogger.cpp @@ -17,7 +17,7 @@ Provides thread-safe logging based on the wxWidgets log facility. #include "Audacity.h" // This should always be included first #include "AudacityLogger.h" -#include "Experimental.h" + #include "FileNames.h" #include "Internat.h" @@ -318,4 +318,4 @@ void AudacityLogger::UpdatePrefs() Show(true); } } -} \ No newline at end of file +} diff --git a/src/AudacityLogger.h b/src/AudacityLogger.h index 0b86c1e2b..23499323b 100644 --- a/src/AudacityLogger.h +++ b/src/AudacityLogger.h @@ -16,7 +16,7 @@ #include "Audacity.h" -#include "Experimental.h" + #include "MemoryX.h" #include "Prefs.h" diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index 4930a0c24..39261002a 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -416,7 +416,7 @@ time warp info and AudioIOListener and whether the playback is looped. #include "Audacity.h" // for USE_* macros #include "AudioIO.h" -#include "Experimental.h" + #include "AudioIOListener.h" diff --git a/src/AudioIO.h b/src/AudioIO.h index b2aed6931..409a7c067 100644 --- a/src/AudioIO.h +++ b/src/AudioIO.h @@ -17,7 +17,7 @@ #include "AudioIOBase.h" // to inherit -#include "Experimental.h" + #include #include diff --git a/src/AudioIOBase.cpp b/src/AudioIOBase.cpp index 4c88b63f0..f88e2441b 100644 --- a/src/AudioIOBase.cpp +++ b/src/AudioIOBase.cpp @@ -11,7 +11,7 @@ Paul Licameli split from AudioIO.cpp #include "Audacity.h" #include "AudioIOBase.h" -#include "Experimental.h" + #include #include diff --git a/src/AudioIOBase.h b/src/AudioIOBase.h index 3d7109574..7101a3923 100644 --- a/src/AudioIOBase.h +++ b/src/AudioIOBase.h @@ -12,7 +12,7 @@ Paul Licameli split from AudioIO.h #define __AUDACITY_AUDIO_IO_BASE__ #include "Audacity.h" // for USE_* macros -#include "Experimental.h" + #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 792e437b6..91c78a6e1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -125,7 +125,6 @@ list( APPEND SOURCES Envelope.h EnvelopeEditor.cpp EnvelopeEditor.h - Experimental.h FFT.cpp FFT.h FFmpeg.cpp @@ -965,6 +964,8 @@ list( APPEND SOURCES xml/XMLWriter.cpp xml/XMLWriter.h xml/audacityproject.dtd + + Experimental.cmake ) # diff --git a/src/CommonCommandFlags.cpp b/src/CommonCommandFlags.cpp index 125b3e5aa..da38a35d8 100644 --- a/src/CommonCommandFlags.cpp +++ b/src/CommonCommandFlags.cpp @@ -11,7 +11,7 @@ Paul Licameli split from Menus.cpp #include "Audacity.h" #include "CommonCommandFlags.h" -#include "Experimental.h" + #include diff --git a/src/CrashReport.cpp b/src/CrashReport.cpp index 0f409d798..3f6f55dca 100644 --- a/src/CrashReport.cpp +++ b/src/CrashReport.cpp @@ -8,9 +8,8 @@ #include "Audacity.h" #include "CrashReport.h" -#include "Experimental.h" -#if defined(EXPERIMENTAL_CRASH_REPORT) +#if defined(HAS_CRASH_REPORT) #include #include diff --git a/src/CrashReport.h b/src/CrashReport.h index 1f4afca74..f72f442b2 100644 --- a/src/CrashReport.h +++ b/src/CrashReport.h @@ -12,17 +12,23 @@ #ifndef __AUDACITY_CRASH_REPORT__ #define __AUDACITY_CRASH_REPORT__ +#undef HAS_CRASH_REPORT + #include "Audacity.h" -#include "Experimental.h" + #if defined(EXPERIMENTAL_CRASH_REPORT) -#include +#include // for wxUSE* macros +#if defined(wxUSE_DEBUGREPORT) && wxUSE_DEBUGREPORT + #define HAS_CRASH_REPORT + #include -namespace CrashReport -{ - void Generate(wxDebugReport::Context ctx); -} + namespace CrashReport + { + void Generate(wxDebugReport::Context ctx); + } +#endif #endif diff --git a/src/DeviceChange.cpp b/src/DeviceChange.cpp index e6f1d9be0..7ee76a3b6 100644 --- a/src/DeviceChange.cpp +++ b/src/DeviceChange.cpp @@ -15,7 +15,7 @@ #include "DeviceChange.h" -#include "Experimental.h" + #if defined(EXPERIMENTAL_DEVICE_CHANGE_HANDLER) diff --git a/src/DeviceChange.h b/src/DeviceChange.h index a5a707ef8..8cb62eae5 100644 --- a/src/DeviceChange.h +++ b/src/DeviceChange.h @@ -13,7 +13,7 @@ #include "Audacity.h" // for HAVE_LIBUDEV_H -#include "Experimental.h" + #if defined(EXPERIMENTAL_DEVICE_CHANGE_HANDLER) diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp index 770145239..32c85a755 100644 --- a/src/DeviceManager.cpp +++ b/src/DeviceManager.cpp @@ -12,7 +12,7 @@ // For compilers that support precompilation, includes "wx/wx.h". #include -#include "Experimental.h" + #include "portaudio.h" #ifdef __WXMSW__ diff --git a/src/DeviceManager.h b/src/DeviceManager.h index 25b2a8dff..9fefadaef 100644 --- a/src/DeviceManager.h +++ b/src/DeviceManager.h @@ -18,7 +18,7 @@ #ifndef __AUDACITY_DEVICEMANAGER__ #define __AUDACITY_DEVICEMANAGER__ -#include "Experimental.h" + #include #include diff --git a/src/Envelope.cpp b/src/Envelope.cpp index 04b7d8afd..b35f2d021 100644 --- a/src/Envelope.cpp +++ b/src/Envelope.cpp @@ -29,7 +29,7 @@ a draggable point type. #include "Envelope.h" -#include "Experimental.h" + #include diff --git a/src/EnvelopeEditor.cpp b/src/EnvelopeEditor.cpp index 1511b93c5..20cc40f40 100644 --- a/src/EnvelopeEditor.cpp +++ b/src/EnvelopeEditor.cpp @@ -11,7 +11,7 @@ #include "Audacity.h" #include "EnvelopeEditor.h" -#include "Experimental.h" + #include #include diff --git a/src/Experimental.cmake b/src/Experimental.cmake new file mode 100644 index 000000000..30c01792a --- /dev/null +++ b/src/Experimental.cmake @@ -0,0 +1,216 @@ +#[[ + + Audacity: A Digital Audio Editor + + Experimental.cmake + + Dominic Mazzoni + James Crook + + Used at configuration time to generate compiler options that enable or disable + experimental features. + + When the features become mainstream the options will then be retired. + + JKC: This file solves a problem of how to avoid forking the + code base when working on NEW features e.g: + - Additional displays in Audacity + - Modular architecture. + Add options in here for the NEW features, and make your code + conditional on them with #ifdef. + + For each name in the list, EXPERIMENTAL_{name} is the token to test with + #ifdef. + + All the options are positive, i.e., when not commented out, + they enable the feature. + +]]# + +set( EXPERIMENTAL_OPTIONS_LIST + # ACH 08 Jan 2014 + # EQ accelerated code + #EQ_SSE_THREADED + + # LLL, 09 Nov 2013: + # Allow all WASAPI devices, not just loopback + FULL_WASAPI + + # JKC (effect by Norm C, 02 Oct 2013) + SCIENCE_FILTERS + + # JKC an experiement to work around bug 2709 + # disabled. + #CEE_NUMBERS_OPTION + + # LLL, 01 Oct 2013: + # NEW key assignment view for preferences + KEY_VIEW + + # feature to link audio tracks to a label track + SYNC_LOCK + + # DA: Enables dark audacity theme and customisations. + #DA + + # Define this so that sync-lock tiles shine through spectrogram. + # The spectrogram pastes a bitmap over the tiles. + # This makes it use alpha blending, most transparent where least intense. + SPECTROGRAM_OVERLAY + + # Define this so that sync-lock tiles shine through note/MIDI track. + # The note track then relies on the same code for drawing background as + # Wavetrack, and draws its notes and lines over the top. + NOTETRACK_OVERLAY + + # Define this, and the option to zoom to half wave is added in the VZoom menu. + # Also we go to half wave on collapse, full wave on restore. + HALF_WAVE + + # THEMING is mostly mainstream now. + # the define is still present to mark out old code before theming, that we might + # conceivably need. + # TODO: Agree on and then tidy this code. + THEMING + + #August 2009 - Theming not locked down enough for a stable release. + # This turns on the Theme panel in Prefs dialog. It is independent of THEMING. + #THEME_PREFS + + # This shows the zoom toggle button on the edit toolbar. + ZOOM_TOGGLE_BUTTON + + #ROLL_UP_DIALOG + #RIGHT_ALIGNED_TEXTBOXES + #VOICE_DETECTION + + # Effect categorisation. Adds support for arranging effects in categories + # and displaying those categories as submenus in the Effect menu. + # This was a 2008 GSoC project that was making good progress at the half-way point + # but then the student didn't contribute after that. It needs a bit of work to finish it off. + # As a minimum, if this is turned on for a release, + # it should have an easy mechanism to disable it at run-time, such as a menu item or a pref, + # preferrably disabled until other work is done. Martyn 22/12/2008. + # + + # JKC Apr 2015, Menu item to manage effects. + EFFECT_MANAGEMENT + + # Andreas Micheler, 20.Nov 2007: + # A spectrumLogF-like view mode with notes quantization. + # Just select the "Find Notes" checkbox in the spectrum prefs + # to activate it instead of the Spectrum log(f) mode. + #FIND_NOTES + + # AM, 22.Nov 2007: + # A Frequency Grid for the Spectrum Log(f) & Find Notes modes + #FFT_Y_GRID + + # Andy Coder, 03.Mar 2009: + # Allow keyboard seeking before initial playback position + #SEEK_BEHIND_CURSOR + + # Paul Licameli (PRL) 5 Oct 2014 + SPECTRAL_EDITING + + # Paul Licameli (PRL) 29 Nov 2014 + #IMPROVED_SEEKING + + #MIDI_IN + + # RBD, 1 Sep 2008 + # Enables MIDI Output of NoteTrack (MIDI) data during playback + # USE_MIDI must be defined in order for MIDI_OUT to work + MIDI_OUT + + # JKC, 17 Aug 2017 + # Enables the MIDI note stretching feature, which currently + # a) Is broken on Linux (Bug 1646) + # b) Crashes with Sync-Lock (Bug 1719) + # c) Needs UI design review. + #MIDI_STRETCHING + + # USE_MIDI must be defined in order for SCOREALIGN to work + #SCOREALIGN + + #NOTEBOOK + + #Automatically tries to find an acceptable input volume + #AUTOMATED_INPUT_LEVEL_ADJUSTMENT + + # Module prefs provides a panel in prefs where users can choose which modules + # to enable. + MODULE_PREFS + + # Define to allow realtime processing in Audacity effects that have been converted. + REALTIME_AUDACITY_EFFECTS + + # Define to include the effects rack (such as it is). + #EFFECTS_RACK + + # Define to make the meters look like a row of LEDs + #METER_LED_STYLE + + # Define to enable the device change handler + #DEVICE_CHANGE_HANDLER + + # Define for NEW noise reduction effect from Paul Licameli. + NOISE_REDUCTION + + # Define to enable Nyquist audio clip boundary control (Steve Daulton Dec 2014) + NYQUIST_SPLIT_CONTROL + + # Paul Licameli (PRL) 16 Apr 2015 + # Support for scrubbing in the AudioIO engine, without calls to it + SCRUBBING_SUPPORT + + # Paul Licameli (PRL) 24 May 2015 + # Allow scrolling up to one half of a screenful beyond either end of the project, + # if you turn on the appropriate Tracks preference. + # This allows smooth-scrolling scrub to work more reasonably at the ends. + SCROLLING_LIMITS + + # Paul Licameli (PRL) 28 May 2015 + # Draw negative numbers on the time ruler in a different color, when + # scrolling past zero is enabled. Perhaps that lessens confusion. + TWO_TONE_TIME_RULER + + #Define to include crash reporting, if available in wxWidgets build + #This flag is used only in CrashReport.h; elsewhere use HAS_CRASH_REPORT + CRASH_REPORT + + # Paul Licameli (PRL) 31 May 2015 + # Zero-padding factor for spectrograms can smooth the display of spectrograms by + # interpolating in frequency domain. + ZERO_PADDED_SPECTROGRAMS + + # PRL 11 Jul 2017 + # Highlight more things in TrackPanel when the mouse moves over them, + # using delibrately ugly pens and brushes until there is better cooperation + # with themes + #TRACK_PANEL_HIGHLIGHTING + + # Paul Licameli (PRL) 28 Dec 2017 + # Easy drag-and-drop to add Nyquist, LADSPA, and VST plug-ins + #DRAG_DROP_PLUG_INS + + # PRL 5 Jan 2018 + # Easy change of keystroke bindings for menu items + EASY_CHANGE_KEY_BINDINGS + + # PRL 1 Jun 2018 + PUNCH_AND_ROLL + + # PRL 31 July 2018 + DRAGGABLE_PLAY_HEAD +) + +# Some more flags that depend on other configuration options + +if( "SCRUBBING_SUPPORT" IN_LIST EXPERIMENTAL_OPTIONS_LIST ) + list( APPEND EXPERIMENTAL_OPTIONS_LIST SCRUBBING_SCROLL_WHEEL ) +endif() + +# Now define the flags +list( TRANSFORM EXPERIMENTAL_OPTIONS_LIST PREPEND "EXPERIMENTAL_" ) +add_compile_definitions( ${EXPERIMENTAL_OPTIONS_LIST} ) diff --git a/src/Experimental.h b/src/Experimental.h deleted file mode 100644 index c64d748a0..000000000 --- a/src/Experimental.h +++ /dev/null @@ -1,254 +0,0 @@ -/********************************************************************** - - Audacity: A Digital Audio Editor - - Experimental.h - - Dominic Mazzoni - James Crook - - Used for #includes and #defines for experimental features. - - When the features become mainstream the #include files will - move out of here and into the files which need them. The - #defines will then be retired. - - - - JKC: This file solves a problem of how to avoid forking the - code base when working on NEW features e.g: - - Additional displays in Audacity - - Modular architecture. - Add #defines in here for the NEW features, and make your code - conditional on those #defines. - - All the #defines are positive, i.e., when defined, - they enable the feature. - -**********************************************************************/ - -#ifndef __EXPERIMENTAL__ -#define __EXPERIMENTAL__ - -#ifndef __AUDACITY_H__ -// Audacity.h is needed for the USE_* macros -#error Must include Audacity.h before Experimental.h -#endif - -// ACH 08 Jan 2014 -// EQ accelerated code -//#define EXPERIMENTAL_EQ_SSE_THREADED - -// LLL, 09 Nov 2013: -// Allow all WASAPI devices, not just loopback -#define EXPERIMENTAL_FULL_WASAPI - -// JKC (effect by Norm C, 02 Oct 2013) -#define EXPERIMENTAL_SCIENCE_FILTERS - -// JKC an experiement to work around bug 2709 -// disabled. -//define EXPERIMENTAL_CEE_NUMBERS_OPTION - -// LLL, 01 Oct 2013: -// NEW key assignment view for preferences -#define EXPERIMENTAL_KEY_VIEW - -// feature to link audio tracks to a label track -#define EXPERIMENTAL_SYNC_LOCK - -// DA: Enables dark audacity theme and customisations. -//#define EXPERIMENTAL_DA - -// These CFG macros allow easy distinction between Audacity and DA defaults. -#ifdef EXPERIMENTAL_DA -#define CFG_A( x ) -#define CFG_DA( x ) x -#else -#define CFG_A( x ) x -#define CFG_DA( x ) -#endif - - -// Define this so that sync-lock tiles shine through spectrogram. -// The spectrogram pastes a bitmap over the tiles. -// This makes it use alpha blending, most transparent where least intense. -#define EXPERIMENTAL_SPECTROGRAM_OVERLAY - -// Define this so that sync-lock tiles shine through note/MIDI track. -// The note track then relies on the same code for drawing background as -// Wavetrack, and draws its notes and lines over the top. -#define EXPERIMENTAL_NOTETRACK_OVERLAY - -// Define this, and the option to zoom to half wave is added in the VZoom menu. -// Also we go to half wave on collapse, full wave on restore. -#define EXPERIMENTAL_HALF_WAVE - -// EXPERIMENTAL_THEMING is mostly mainstream now. -// the define is still present to mark out old code before theming, that we might -// conceivably need. -// TODO: Agree on and then tidy this code. -#define EXPERIMENTAL_THEMING - -//August 2009 - Theming not locked down enough for a stable release. -// This turns on the Theme panel in Prefs dialog. It is independent of EXPERIMENTAL_THEMING. -//#define EXPERIMENTAL_THEME_PREFS - -// This shows the zoom toggle button on the edit toolbar. -#define EXPERIMENTAL_ZOOM_TOGGLE_BUTTON - -//#define EXPERIMENTAL_ROLL_UP_DIALOG -//#define EXPERIMENTAL_RIGHT_ALIGNED_TEXTBOXES -//#define EXPERIMENTAL_VOICE_DETECTION - -// Effect categorisation. Adds support for arranging effects in categories -// and displaying those categories as submenus in the Effect menu. -// This was a 2008 GSoC project that was making good progress at the half-way point -// but then the student didn't contribute after that. It needs a bit of work to finish it off. -// As a minimum, if this is turned on for a release, -// it should have an easy mechanism to disable it at run-time, such as a menu item or a pref, -// preferably disabled until other work is done. Martyn 22/12/2008. -// - -// JKC Apr 2015, Menu item to manage effects. -#define EXPERIMENTAL_EFFECT_MANAGEMENT - -// Andreas Micheler, 20.Nov 2007: -// A spectrumLogF-like view mode with notes quantization. -// Just select the "Find Notes" checkbox in the spectrum prefs -// to activate it instead of the Spectrum log(f) mode. -//#define EXPERIMENTAL_FIND_NOTES - -// AM, 22.Nov 2007: -// A Frequency Grid for the Spectrum Log(f) & Find Notes modes -//#define EXPERIMENTAL_FFT_Y_GRID - -// Andy Coder, 03.Mar 2009: -// Allow keyboard seeking before initial playback position -//#define EXPERIMENTAL_SEEK_BEHIND_CURSOR - -// Paul Licameli (PRL) 5 Oct 2014 -#define EXPERIMENTAL_SPECTRAL_EDITING - -// Paul Licameli (PRL) 29 Nov 2014 -// #define EXPERIMENTAL_IMPROVED_SEEKING - -//#define EXPERIMENTAL_MIDI_IN - -// RBD, 1 Sep 2008 -// Enables MIDI Output of NoteTrack (MIDI) data during playback -// USE_MIDI must be defined in order for EXPERIMENTAL_MIDI_OUT to work -#ifdef USE_MIDI -#define EXPERIMENTAL_MIDI_OUT -#endif -// JKC, 17 Aug 2017 -// Enables the MIDI note stretching feature, which currently -// a) Is broken on Linux (Bug 1646) -// b) Crashes with Sync-Lock (Bug 1719) -// c) Needs UI design review. -//#define EXPERIMENTAL_MIDI_STRETCHING - -// USE_MIDI must be defined in order for EXPERIMENTAL_SCOREALIGN to work -//#define EXPERIMENTAL_SCOREALIGN - -//If you want any of these files, ask JKC. They are not -//yet checked in to Audacity SVN as of 12-Feb-2010 -#ifdef EXPERIMENTAL_NOTEBOOK - #include "widgets/GuiFactory.h" - #include "widgets/APanel.h" - extern void AddPages( AudacityProject * pProj, GuiFactory & Factory, wxNotebook * pNotebook ); -#endif - -#ifdef EXPERIMENTAL_NYQUIST_INSPECTOR - #include "NyquistAdapter.h" -#endif - -#if USE_PORTMIXER - //Automatically tries to find an acceptable input volume - //#define EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT -#endif - -// Module prefs provides a panel in prefs where users can choose which modules -// to enable. -#define EXPERIMENTAL_MODULE_PREFS - -// Define to allow realtime processing in Audacity effects that have been converted. -#define EXPERIMENTAL_REALTIME_AUDACITY_EFFECTS - -// Define to include the effects rack (such as it is). -//#define EXPERIMENTAL_EFFECTS_RACK - -// Define to make the meters look like a row of LEDs -//#define EXPERIMENTAL_METER_LED_STYLE - -// Define to enable the device change handler -//#define EXPERIMENTAL_DEVICE_CHANGE_HANDLER - -// Define for NEW noise reduction effect from Paul Licameli. -#define EXPERIMENTAL_NOISE_REDUCTION - -// Define to enable Nyquist audio clip boundary control (Steve Daulton Dec 2014) -#define EXPERIMENTAL_NYQUIST_SPLIT_CONTROL - -// Paul Licameli (PRL) 16 Apr 2015 -// Support for scrubbing in the AudioIO engine, without calls to it -#define EXPERIMENTAL_SCRUBBING_SUPPORT -#ifdef EXPERIMENTAL_SCRUBBING_SUPPORT - // The following enable parts of the scrubbing user interface. - #define EXPERIMENTAL_SCRUBBING_BASIC - #ifdef EXPERIMENTAL_SCRUBBING_BASIC - #define EXPERIMENTAL_SCRUBBING_SCROLL_WHEEL - #endif -#endif - -// Paul Licameli (PRL) 24 May 2015 -// Allow scrolling up to one half of a screenful beyond either end of the project, -// if you turn on the appropriate Tracks preference. -// This allows smooth-scrolling scrub to work more reasonably at the ends. -#define EXPERIMENTAL_SCROLLING_LIMITS - -// Paul Licameli (PRL) 28 May 2015 -// Draw negative numbers on the time ruler in a different color, when -// scrolling past zero is enabled. Perhaps that lessens confusion. -#define EXPERIMENTAL_TWO_TONE_TIME_RULER - -#ifndef IN_RC - // Define to include crash reporting - #define EXPERIMENTAL_CRASH_REPORT - #ifdef EXPERIMENTAL_CRASH_REPORT - #include // for wxUSE* macros - #if !defined(wxUSE_DEBUGREPORT) || !wxUSE_DEBUGREPORT - #undef EXPERIMENTAL_CRASH_REPORT - #endif - #endif -#endif - -// Paul Licameli (PRL) 31 May 2015 -// Zero-padding factor for spectrograms can smooth the display of spectrograms by -// interpolating in frequency domain. -#define EXPERIMENTAL_ZERO_PADDED_SPECTROGRAMS - -// PRL 11 Jul 2017 -// Highlight more things in TrackPanel when the mouse moves over them, -// using deliberately ugly pens and brushes until there is better cooperation -// with themes -//#define EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING - -// Paul Licameli (PRL) 28 Dec 2017 -// Easy drag-and-drop to add Nyquist, LADSPA, and VST plug-ins -// #define EXPERIMENTAL_DRAG_DROP_PLUG_INS - -// PRL 5 Jan 2018 -// Easy change of keystroke bindings for menu items -#define EXPERIMENTAL_EASY_CHANGE_KEY_BINDINGS - -// PRL 1 Jun 2018 -#define EXPERIMENTAL_PUNCH_AND_ROLL - -// PRL 31 July 2018 -#define EXPERIMENTAL_DRAGGABLE_PLAY_HEAD - -// Jonatã Bolzan Loss 31 Dec 2019 -#define EXPERIMENTAL_TIMER_TOOLBAR - -#endif diff --git a/src/FileNames.cpp b/src/FileNames.cpp index b02e10e21..5e7f8bb40 100644 --- a/src/FileNames.cpp +++ b/src/FileNames.cpp @@ -23,7 +23,7 @@ used throughout Audacity into this one place. #include "Audacity.h" #include "FileNames.h" -#include "Experimental.h" + #include "MemoryX.h" diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 28f585111..d22054b37 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -15,7 +15,7 @@ #include "Audacity.h" // for USE_* macros #include "HelpText.h" -#include "Experimental.h" + #include #include diff --git a/src/Internat.cpp b/src/Internat.cpp index fdc250f0d..a7e17f711 100644 --- a/src/Internat.cpp +++ b/src/Internat.cpp @@ -22,7 +22,7 @@ and on Mac OS X for the filesystem. #include "Internat.h" -#include "Experimental.h" + #include "MemoryX.h" #include diff --git a/src/Internat.h b/src/Internat.h index 208dccdbf..b6edc94b0 100644 --- a/src/Internat.h +++ b/src/Internat.h @@ -16,7 +16,6 @@ #include -#ifndef IN_RC #include "audacity/Types.h" class wxArrayString; @@ -102,8 +101,6 @@ extern AUDACITY_DLL_API const wxString& GetCustomSubstitution(const wxString& st #define XPC(sing, plur, n, c) \ TranslatableString{ wxT(sing), {} }.Context(c).Plural<(n)>( wxT(plur) ) -#endif - class Internat { public: diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index 0d901b900..feadd863e 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -34,7 +34,7 @@ for drawing different aspects of the label and its text box. #include "tracks/ui/TrackView.h" #include "tracks/ui/TrackControls.h" -#include "Experimental.h" + #include #include diff --git a/src/Menus.cpp b/src/Menus.cpp index c2f14addb..7cb4dd962 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -28,7 +28,7 @@ #include "Audacity.h" // for USE_* macros #include "Menus.h" -#include "Experimental.h" + #include diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index f07fd3b3d..a30c5dca7 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -12,7 +12,7 @@ #include "Audacity.h" // for USE_* macros #include "MixerBoard.h" -#include "Experimental.h" + #include #include diff --git a/src/MixerBoard.h b/src/MixerBoard.h index a67f8cf16..5959b9e49 100644 --- a/src/MixerBoard.h +++ b/src/MixerBoard.h @@ -9,7 +9,7 @@ **********************************************************************/ #include "Audacity.h" // for USE_* macros -#include "Experimental.h" + #ifndef __AUDACITY_MIXER_BOARD__ #define __AUDACITY_MIXER_BOARD__ diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index bf01896c1..9255c7545 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -22,7 +22,7 @@ i.e. an alternative to the usual interface, for Audacity. #include "ModuleManager.h" #include "audacity/ModuleInterface.h" -#include "Experimental.h" + #include #include diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index c73d4b83a..a6a8ecf91 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -17,7 +17,7 @@ #include "Audacity.h" // for USE_* macros #include "NoteTrack.h" -#include "Experimental.h" + #include #include diff --git a/src/NoteTrack.h b/src/NoteTrack.h index ceb7c0c0f..dcef3ba9c 100644 --- a/src/NoteTrack.h +++ b/src/NoteTrack.h @@ -13,7 +13,7 @@ #include "Audacity.h" // for USE_* macros -#include "Experimental.h" + #include #include "Track.h" diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index b1a46b76e..61079eaa9 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -21,7 +21,7 @@ for shared and private configs - which need to move out. #include "Audacity.h" #include "PluginManager.h" -#include "Experimental.h" + #include diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp index 23a389e84..d3fc65b10 100644 --- a/src/ProjectAudioManager.cpp +++ b/src/ProjectAudioManager.cpp @@ -11,7 +11,7 @@ Paul Licameli split from ProjectManager.cpp #include "Audacity.h" #include "ProjectAudioManager.h" -#include "Experimental.h" + #include #include diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp index 82781b65c..53bb5500d 100644 --- a/src/ProjectFileManager.cpp +++ b/src/ProjectFileManager.cpp @@ -10,8 +10,6 @@ Paul Licameli split from AudacityProject.cpp #include "ProjectFileManager.h" -#include "Experimental.h" - #include // for wxPrintf #if defined(__WXGTK__) diff --git a/src/ProjectManager.cpp b/src/ProjectManager.cpp index 5e6c48662..f3f7a4cf6 100644 --- a/src/ProjectManager.cpp +++ b/src/ProjectManager.cpp @@ -10,7 +10,7 @@ Paul Licameli split from AudacityProject.cpp #include "ProjectManager.h" -#include "Experimental.h" + #include "AdornedRulerPanel.h" #include "AudioIO.h" @@ -350,6 +350,10 @@ private: #endif +#ifdef EXPERIMENTAL_NOTEBOOK + extern void AddPages( AudacityProject * pProj, GuiFactory & Factory, wxNotebook * pNotebook ); +#endif + void InitProjectWindow( ProjectWindow &window ) { auto &project = window.GetProject(); diff --git a/src/ProjectSelectionManager.cpp b/src/ProjectSelectionManager.cpp index 983523d01..84244f429 100644 --- a/src/ProjectSelectionManager.cpp +++ b/src/ProjectSelectionManager.cpp @@ -10,7 +10,7 @@ Paul Licameli split from ProjectManager.cpp #include "ProjectSelectionManager.h" -#include "Experimental.h" + #include "Project.h" #include "ProjectHistory.h" diff --git a/src/ProjectSettings.cpp b/src/ProjectSettings.cpp index 630123ffd..b22d53503 100644 --- a/src/ProjectSettings.cpp +++ b/src/ProjectSettings.cpp @@ -10,7 +10,7 @@ Paul Licameli split from AudacityProject.cpp #include "ProjectSettings.h" -#include "Experimental.h" + #include "AudioIOBase.h" #include "Project.h" diff --git a/src/ProjectWindow.cpp b/src/ProjectWindow.cpp index 78e68c42a..179529dd6 100644 --- a/src/ProjectWindow.cpp +++ b/src/ProjectWindow.cpp @@ -10,7 +10,7 @@ Paul Licameli split from AudacityProject.cpp #include "ProjectWindow.h" -#include "Experimental.h" + #include "AllThemeResources.h" #include "Menus.h" @@ -566,6 +566,13 @@ enum { NextID, }; +//If you want any of these files, ask JKC. They are not +//yet checked in to Audacity SVN as of 12-Feb-2010 +#ifdef EXPERIMENTAL_NOTEBOOK + #include "GuiFactory.h" + #include "APanel.h" +#endif + ProjectWindow::ProjectWindow(wxWindow * parent, wxWindowID id, const wxPoint & pos, const wxSize & size, AudacityProject &project) diff --git a/src/RealFFTf.cpp b/src/RealFFTf.cpp index feec26493..2fb2c9ade 100644 --- a/src/RealFFTf.cpp +++ b/src/RealFFTf.cpp @@ -39,7 +39,7 @@ #include "Audacity.h" #include "RealFFTf.h" -#include "Experimental.h" + #include #include diff --git a/src/RealFFTf.h b/src/RealFFTf.h index f8dc96edc..abd657dfb 100644 --- a/src/RealFFTf.h +++ b/src/RealFFTf.h @@ -3,7 +3,7 @@ #include "Audacity.h" -#include "Experimental.h" + #include "MemoryX.h" diff --git a/src/RealFFTf48x.cpp b/src/RealFFTf48x.cpp index b0ba67ea3..8df792389 100644 --- a/src/RealFFTf48x.cpp +++ b/src/RealFFTf48x.cpp @@ -57,7 +57,7 @@ #include "Audacity.h" // for USE_* macros #include "RealFFTf48x.h" -#include "Experimental.h" + #ifdef EXPERIMENTAL_EQ_SSE_THREADED diff --git a/src/SelectedRegion.cpp b/src/SelectedRegion.cpp index 464b8dcaf..760a4892a 100644 --- a/src/SelectedRegion.cpp +++ b/src/SelectedRegion.cpp @@ -10,7 +10,7 @@ Paul Licameli #include "SelectedRegion.h" -#include "Experimental.h" + #include "xml/XMLWriter.h" diff --git a/src/SelectedRegion.h b/src/SelectedRegion.h index 020313c30..4882f6e57 100644 --- a/src/SelectedRegion.h +++ b/src/SelectedRegion.h @@ -27,7 +27,7 @@ #include "Audacity.h" -#include "Experimental.h" + #include #include // for wxChar, a typedef diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index 8b0a1aeeb..c5bfab81a 100644 --- a/src/ShuttleGui.cpp +++ b/src/ShuttleGui.cpp @@ -96,7 +96,7 @@ for registering for changes. #include "Audacity.h" #include "ShuttleGui.h" -#include "Experimental.h" + #include "Prefs.h" #include "ShuttlePrefs.h" diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index 0bb68873b..0456a0ec5 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -23,7 +23,7 @@ most commonly asked questions about Audacity. #include "Audacity.h" #include "SplashDialog.h" -#include "Experimental.h" + #include #include diff --git a/src/Theme.cpp b/src/Theme.cpp index 09e93809e..6a4a21193 100644 --- a/src/Theme.cpp +++ b/src/Theme.cpp @@ -62,7 +62,7 @@ can't be. #include "Audacity.h" #include "Theme.h" -#include "Experimental.h" + #include #include diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp index 4a8eeefb6..2c9d6a683 100644 --- a/src/TimeTrack.cpp +++ b/src/TimeTrack.cpp @@ -16,7 +16,7 @@ #include "Audacity.h" #include "TimeTrack.h" -#include "Experimental.h" + #include #include diff --git a/src/Track.cpp b/src/Track.cpp index fb4936bfb..50da913a3 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -25,7 +25,7 @@ and TimeTrack. #include "Track.h" -#include "Experimental.h" + #include #include diff --git a/src/Track.h b/src/Track.h index 3adbf1b5a..a0ccc20f4 100644 --- a/src/Track.h +++ b/src/Track.h @@ -14,7 +14,7 @@ #include "Audacity.h" // for USE_* macros -#include "Experimental.h" + #include #include diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index eec1f4f8b..273b3279d 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -41,7 +41,7 @@ audio tracks. #include "Audacity.h" // for USE_* macros and HAVE_ALLOCA_H #include "TrackArtist.h" -#include "Experimental.h" + #include "AColor.h" #include "AllThemeResources.h" diff --git a/src/TrackArtist.h b/src/TrackArtist.h index d790cd94d..c38d62907 100644 --- a/src/TrackArtist.h +++ b/src/TrackArtist.h @@ -19,7 +19,7 @@ #define __AUDACITY_TRACKARTIST__ #include "Audacity.h" // for USE_* macros -#include "Experimental.h" + #include // member variable #include // member variables diff --git a/src/TrackInfo.cpp b/src/TrackInfo.cpp index 4825c0220..993e93bcb 100644 --- a/src/TrackInfo.cpp +++ b/src/TrackInfo.cpp @@ -28,7 +28,7 @@ Paul Licameli split from TrackPanel.cpp #include "Audacity.h" #include "TrackInfo.h" -#include "Experimental.h" + #include #include diff --git a/src/TrackInfo.h b/src/TrackInfo.h index 154457796..af861d232 100644 --- a/src/TrackInfo.h +++ b/src/TrackInfo.h @@ -12,7 +12,7 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_TRACK_INFO__ #include "Audacity.h" -#include "Experimental.h" + #include diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index c6a862866..28ae542ed 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -46,7 +46,7 @@ is time to refresh some aspect of the screen. #include "Audacity.h" // for USE_* macros #include "TrackPanel.h" -#include "Experimental.h" + #include // for wxUSE_* macros diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 52dafb0cc..381b85acb 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -12,7 +12,7 @@ #define __AUDACITY_TRACK_PANEL__ #include "Audacity.h" // for USE_* macros -#include "Experimental.h" + #include diff --git a/src/ViewInfo.cpp b/src/ViewInfo.cpp index b0c20ae88..6ba76e61b 100644 --- a/src/ViewInfo.cpp +++ b/src/ViewInfo.cpp @@ -10,7 +10,7 @@ Paul Licameli #include "ViewInfo.h" -#include "Experimental.h" + #include diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp index 7692da765..38fb6577c 100644 --- a/src/WaveClip.cpp +++ b/src/WaveClip.cpp @@ -21,7 +21,7 @@ #include "WaveClip.h" -#include "Experimental.h" + #include #include diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 8cc499617..d3802c95b 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -28,7 +28,7 @@ from the project that will own the track. #include "WaveTrack.h" -#include "Experimental.h" + #include "WaveClip.h" diff --git a/src/ZoomInfo.cpp b/src/ZoomInfo.cpp index 13432e764..f0a88c9eb 100644 --- a/src/ZoomInfo.cpp +++ b/src/ZoomInfo.cpp @@ -11,7 +11,7 @@ #include "Audacity.h" #include "ZoomInfo.h" -#include "Experimental.h" + #include "prefs/GUISettings.h" diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index ce721b1d5..1b1d837b6 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -77,8 +77,6 @@ CommandManager. It holds the callback for one command. #include "../Audacity.h" -#include "../Experimental.h" - #include "CommandManager.h" #include "CommandContext.h" diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h index c380c01bc..fd73c6890 100644 --- a/src/commands/CommandManager.h +++ b/src/commands/CommandManager.h @@ -12,8 +12,6 @@ #ifndef __AUDACITY_COMMAND_MANAGER__ #define __AUDACITY_COMMAND_MANAGER__ -#include "../Experimental.h" - #include "audacity/Types.h" #include "../ClientData.h" diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index c0e953664..efb052e75 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -18,8 +18,6 @@ #include "BassTreble.h" #include "LoadEffects.h" -#include "../Experimental.h" - #include #include diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index ae0e64d54..bb4d187f6 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -20,8 +20,6 @@ #include "Distortion.h" #include "LoadEffects.h" -#include "../Experimental.h" - #include #include #define _USE_MATH_DEFINES diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index ee9482093..dbab079bc 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -17,8 +17,6 @@ #include "DtmfGen.h" #include "LoadEffects.h" -#include "../Experimental.h" - #include #include #include diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index e5663224e..4f8c1e2b1 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -19,8 +19,6 @@ #include "Effect.h" #include "TimeWarper.h" -#include "../Experimental.h" - #include #include diff --git a/src/effects/Effect.h b/src/effects/Effect.h index f23812f2f..a22bce3ac 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -14,8 +14,6 @@ #include "../Audacity.h" -#include "../Experimental.h" - #include #include diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h index 46caf0d37..d7103a8f9 100644 --- a/src/effects/EffectManager.h +++ b/src/effects/EffectManager.h @@ -12,8 +12,6 @@ #ifndef __AUDACITY_EFFECTMANAGER__ #define __AUDACITY_EFFECTMANAGER__ -#include "../Experimental.h" - #include #include diff --git a/src/effects/EffectUI.cpp b/src/effects/EffectUI.cpp index c3723ec8e..80d0a7834 100644 --- a/src/effects/EffectUI.cpp +++ b/src/effects/EffectUI.cpp @@ -14,8 +14,6 @@ #include "../Audacity.h" #include "EffectUI.h" -#include "../Experimental.h" - #include "Effect.h" #include "EffectManager.h" #include "../ProjectHistory.h" diff --git a/src/effects/EffectUI.h b/src/effects/EffectUI.h index d4f1acd3d..307a9fe70 100644 --- a/src/effects/EffectUI.h +++ b/src/effects/EffectUI.h @@ -14,8 +14,6 @@ #ifndef __AUDACITY_EFFECTUI_H__ #define __AUDACITY_EFFECTUI_H__ -#include "../Experimental.h" - #include // member variables #if defined(EXPERIMENTAL_EFFECTS_RACK) diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 20b30adc6..9f6d0868d 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -56,8 +56,6 @@ #include "Equalization.h" #include "LoadEffects.h" -#include "../Experimental.h" - #include #include diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index e9f909ab5..686e65525 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -9,8 +9,6 @@ ***********************************************************************/ -#include "../Experimental.h" - #ifndef __AUDACITY_EFFECT_EQUALIZATION__ #define __AUDACITY_EFFECT_EQUALIZATION__ #define NUMBER_OF_BANDS 31 diff --git a/src/effects/Equalization48x.cpp b/src/effects/Equalization48x.cpp index 571389615..b8da8e731 100644 --- a/src/effects/Equalization48x.cpp +++ b/src/effects/Equalization48x.cpp @@ -16,8 +16,6 @@ #include "../Audacity.h" // for USE_* macros #include "Equalization48x.h" -#include "../Experimental.h" - #ifdef EXPERIMENTAL_EQ_SSE_THREADED #include "../Project.h" #include "Equalization.h" diff --git a/src/effects/Equalization48x.h b/src/effects/Equalization48x.h index 7519bb520..cf8883a94 100644 --- a/src/effects/Equalization48x.h +++ b/src/effects/Equalization48x.h @@ -11,8 +11,6 @@ Intrinsics (SSE/AVX) and Threaded Equalization #ifndef __AUDACITY_EFFECT_EQUALIZATION48X__ #define __AUDACITY_EFFECT_EQUALIZATION48X__ -#include "../Experimental.h" - #ifdef EXPERIMENTAL_EQ_SSE_THREADED #include "../MemoryX.h" diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index ca75da0b4..2ce45a53a 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -39,8 +39,6 @@ #include "../Audacity.h" #include "NoiseReduction.h" -#include "../Experimental.h" - #include "LoadEffects.h" #include "EffectManager.h" #include "EffectUI.h" diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp index 68bb1658c..756ceac63 100644 --- a/src/effects/NoiseRemoval.cpp +++ b/src/effects/NoiseRemoval.cpp @@ -41,8 +41,6 @@ #include "../Audacity.h" #include "NoiseRemoval.h" -#include "../Experimental.h" - #if !defined(EXPERIMENTAL_NOISE_REDUCTION) #include "LoadEffects.h" diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index 86e8845c7..80f5a4f56 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -14,8 +14,6 @@ #include "../Audacity.h" -#include "../Experimental.h" - #if !defined(EXPERIMENTAL_NOISE_REDUCTION) #include "Effect.h" diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index 435c11436..591a3f1c9 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -19,8 +19,6 @@ #include "Normalize.h" #include "LoadEffects.h" -#include "../Experimental.h" - #include #include diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h index 67416002d..2ba30ff3f 100644 --- a/src/effects/Normalize.h +++ b/src/effects/Normalize.h @@ -12,8 +12,6 @@ #ifndef __AUDACITY_EFFECT_NORMALIZE__ #define __AUDACITY_EFFECT_NORMALIZE__ -#include "../Experimental.h" - #include "Effect.h" #include "Biquad.h" diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index 8bf244e37..2e94ac221 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -23,8 +23,6 @@ #include "Phaser.h" #include "LoadEffects.h" -#include "../Experimental.h" - #include #include diff --git a/src/effects/RealtimeEffectManager.cpp b/src/effects/RealtimeEffectManager.cpp index f7e7f7c0c..3ceeb41c0 100644 --- a/src/effects/RealtimeEffectManager.cpp +++ b/src/effects/RealtimeEffectManager.cpp @@ -11,8 +11,6 @@ #include "../Audacity.h" #include "RealtimeEffectManager.h" -#include "../Experimental.h" - #include "audacity/EffectInterface.h" #include "MemoryX.h" diff --git a/src/effects/ScoreAlignDialog.cpp b/src/effects/ScoreAlignDialog.cpp index eb52bba5c..4c096ce27 100644 --- a/src/effects/ScoreAlignDialog.cpp +++ b/src/effects/ScoreAlignDialog.cpp @@ -19,8 +19,6 @@ It \TODO: description #include "../Audacity.h" #include "ScoreAlignDialog.h" -#include "../Experimental.h" - #ifdef EXPERIMENTAL_SCOREALIGN // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/effects/ScoreAlignDialog.h b/src/effects/ScoreAlignDialog.h index 23965aaaf..190a527ec 100644 --- a/src/effects/ScoreAlignDialog.h +++ b/src/effects/ScoreAlignDialog.h @@ -9,8 +9,6 @@ #ifndef __AUDACITY_SCORE_ALIGN_DIALOG__ #define __AUDACITY_SCORE_ALIGN_DIALOG__ -#include "../Experimental.h" - #ifdef EXPERIMENTAL_SCOREALIGN #include diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index bb7d05ee9..df129e075 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -22,8 +22,6 @@ #include "Wahwah.h" #include "LoadEffects.h" -#include "../Experimental.h" - #include #include diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 1710201fd..e95004416 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -27,8 +27,6 @@ effects from this one class. #include "../../Audacity.h" // for USE_* macros #include "Nyquist.h" -#include "../../Experimental.h" - #include #include diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp index f8655468f..40256a0e0 100644 --- a/src/import/ImportFFmpeg.cpp +++ b/src/import/ImportFFmpeg.cpp @@ -22,8 +22,6 @@ Licensed under the GNU General Public License v2 or later #include "../Audacity.h" // needed before FFmpeg.h // for USE_* macros -#include "../Experimental.h" - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp index 1970b7f91..ffbf7372e 100644 --- a/src/import/ImportFLAC.cpp +++ b/src/import/ImportFLAC.cpp @@ -24,8 +24,6 @@ #include "../Audacity.h" // for USE_* macros -#include "../Experimental.h" - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp index 2c01eb66d..68b661540 100644 --- a/src/menus/FileMenus.cpp +++ b/src/menus/FileMenus.cpp @@ -1,5 +1,4 @@ #include "../Audacity.h" // for USE_* macros -#include "../Experimental.h" #include "../CommonCommandFlags.h" #include "../FileNames.h" diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp index 136327b1f..9b03b69fc 100644 --- a/src/menus/HelpMenus.cpp +++ b/src/menus/HelpMenus.cpp @@ -1,5 +1,4 @@ #include "../Audacity.h" -#include "../Experimental.h" #include #include @@ -10,7 +9,7 @@ #include "../AudacityLogger.h" #include "../AudioIOBase.h" #include "../CommonCommandFlags.h" -#include "../CrashReport.h" +#include "../CrashReport.h" // for HAS_CRASH_REPORT #include "../FileNames.h" #include "../HelpText.h" #include "../Menus.h" @@ -26,10 +25,6 @@ #include "../widgets/AudacityMessageBox.h" #include "../widgets/HelpSystem.h" -#if defined(EXPERIMENTAL_CRASH_REPORT) -#include -#endif - // private helper classes and functions namespace { @@ -353,7 +348,7 @@ void OnShowLog( const CommandContext &context ) } } -#if defined(EXPERIMENTAL_CRASH_REPORT) +#if defined(HAS_CRASH_REPORT) void OnCrashReport(const CommandContext &WXUNUSED(context) ) { // Change to "1" to test a real crash @@ -523,7 +518,7 @@ BaseItemSharedPtr HelpMenu() #endif Command( wxT("Log"), XXO("Show &Log..."), FN(OnShowLog), AlwaysEnabledFlag ), - #if defined(EXPERIMENTAL_CRASH_REPORT) + #if defined(HAS_CRASH_REPORT) Command( wxT("CrashReport"), XXO("&Generate Support Data..."), FN(OnCrashReport), AlwaysEnabledFlag ) #endif diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp index b5ed43e7c..6814ab4b9 100644 --- a/src/menus/PluginMenus.cpp +++ b/src/menus/PluginMenus.cpp @@ -1,5 +1,4 @@ #include "../Audacity.h" -#include "../Experimental.h" #include "../AudioIO.h" #include "../BatchProcessDialog.h" diff --git a/src/menus/SelectMenus.cpp b/src/menus/SelectMenus.cpp index 1a2bd0e66..06fda3132 100644 --- a/src/menus/SelectMenus.cpp +++ b/src/menus/SelectMenus.cpp @@ -1,5 +1,4 @@ #include "../Audacity.h" -#include "../Experimental.h" #include "../AdornedRulerPanel.h" #include "../AudioIO.h" diff --git a/src/menus/TrackMenus.cpp b/src/menus/TrackMenus.cpp index 0abe11d1b..232a98d52 100644 --- a/src/menus/TrackMenus.cpp +++ b/src/menus/TrackMenus.cpp @@ -1,5 +1,4 @@ #include "../Audacity.h" -#include "../Experimental.h" #include "../CommonCommandFlags.h" #include "../LabelTrack.h" diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index 04acc21a9..6da7ddd54 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -1,5 +1,4 @@ #include "../Audacity.h" -#include "../Experimental.h" #include "../AdornedRulerPanel.h" #include "../AudioIO.h" diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp index 5f640fff5..d9b5e2298 100644 --- a/src/menus/ViewMenus.cpp +++ b/src/menus/ViewMenus.cpp @@ -1,5 +1,4 @@ #include "../Audacity.h" -#include "../Experimental.h" #include "../CommonCommandFlags.h" #include "../Menus.h" diff --git a/src/ondemand/ODDecodeFFmpegTask.cpp b/src/ondemand/ODDecodeFFmpegTask.cpp index 0ce7aa223..c031af48c 100644 --- a/src/ondemand/ODDecodeFFmpegTask.cpp +++ b/src/ondemand/ODDecodeFFmpegTask.cpp @@ -13,8 +13,6 @@ #include "../blockfile/ODDecodeBlockFile.h" // base class #include "ODDecodeFFmpegTask.h" -#include "../Experimental.h" - #include #include // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/ondemand/ODDecodeFFmpegTask.h b/src/ondemand/ODDecodeFFmpegTask.h index 162ae7566..12176637b 100644 --- a/src/ondemand/ODDecodeFFmpegTask.h +++ b/src/ondemand/ODDecodeFFmpegTask.h @@ -12,8 +12,6 @@ #ifndef __ODDECODEFFMPEGTASK__ #define __ODDECODEFFMPEGTASK__ -#include "../Experimental.h" - #ifdef EXPERIMENTAL_OD_FFMPEG #include diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index b71565ddf..032140690 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -20,8 +20,6 @@ #include "../Audacity.h" // for USE_* macros #include "EffectsPrefs.h" -#include "../Experimental.h" - #include #include diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index 79ee95e12..5b027ddcf 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -20,8 +20,6 @@ #include "../Audacity.h" #include "GUIPrefs.h" -#include "../Experimental.h" - #include #include #include diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index 0765b0f47..68fd07205 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -19,8 +19,6 @@ MP3 and FFmpeg encoding libraries. #include "../Audacity.h" // for USE_* macros #include "LibraryPrefs.h" -#include "../Experimental.h" - #include #include #include diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 40c0da21d..249cd38aa 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -26,8 +26,6 @@ other settings. #include "../Audacity.h" #include "MidiIOPrefs.h" -#include "../Experimental.h" - #ifdef EXPERIMENTAL_MIDI_OUT #include diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index b717a926a..b197332d6 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -9,8 +9,6 @@ **********************************************************************/ -#include "../Experimental.h" - class wxChoice; class wxTextCtrl; class ShuttleGui; diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp index 404b8f4c3..a79fd48fa 100644 --- a/src/prefs/ModulePrefs.cpp +++ b/src/prefs/ModulePrefs.cpp @@ -18,7 +18,7 @@ with names like mnod-script-pipe that add NEW features. #include "../Audacity.h" #include "ModulePrefs.h" -#include "Experimental.h" + #include #include diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp index d23a9b2f0..81d0dcbc0 100644 --- a/src/prefs/MousePrefs.cpp +++ b/src/prefs/MousePrefs.cpp @@ -35,8 +35,6 @@ #include "../Audacity.h" #include "MousePrefs.h" -#include "../Experimental.h" - #include #include #include diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 547652308..0794acf29 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -21,8 +21,6 @@ #include "../Audacity.h" #include "RecordingPrefs.h" -#include "../Experimental.h" - #include #include #include diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h index c97ef0999..61b7d8523 100644 --- a/src/prefs/RecordingPrefs.h +++ b/src/prefs/RecordingPrefs.h @@ -13,7 +13,6 @@ #define __AUDACITY_RECORDING_PREFS__ #include "../Audacity.h" -#include "../Experimental.h" #include diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index c275c395c..e535f3732 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -16,8 +16,6 @@ Paul Licameli #include "../Audacity.h" #include "SpectrogramSettings.h" -#include "../Experimental.h" - #include "../NumberScale.h" #include diff --git a/src/prefs/SpectrogramSettings.h b/src/prefs/SpectrogramSettings.h index 6eb4dd28f..db8286c26 100644 --- a/src/prefs/SpectrogramSettings.h +++ b/src/prefs/SpectrogramSettings.h @@ -11,13 +11,10 @@ Paul Licameli #ifndef __AUDACITY_SPECTROGRAM_SETTINGS__ #define __AUDACITY_SPECTROGRAM_SETTINGS__ -#include "../Experimental.h" - #include "../Prefs.h" #include "../SampleFormat.h" #include "../RealFFTf.h" - #undef SPECTRAL_SELECTION_GLOBAL_SWITCH class EnumValueSymbols; diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index 67e73c01f..ee701244b 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -17,8 +17,6 @@ #include "../Audacity.h" #include "SpectrumPrefs.h" -#include "../Experimental.h" - #include #include #include diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index 3d0439fca..548473011 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -21,8 +21,6 @@ #ifndef __AUDACITY_SPECTRUM_PREFS__ #define __AUDACITY_SPECTRUM_PREFS__ -#include "../Experimental.h" - #include #include diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp index 126ec95c2..f9b23155a 100644 --- a/src/prefs/ThemePrefs.cpp +++ b/src/prefs/ThemePrefs.cpp @@ -31,8 +31,6 @@ Provides: #include "../Audacity.h" #include "ThemePrefs.h" -#include "../Experimental.h" - #include #include #include "../Prefs.h" diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 9b34fc8a5..3a9f35b7e 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -17,8 +17,6 @@ #include "../Audacity.h" #include "TracksBehaviorsPrefs.h" -#include "../Experimental.h" - #include "../Prefs.h" #include "../ShuttleGui.h" diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index a17135548..c310d9d58 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -20,8 +20,6 @@ #include "../Audacity.h" #include "TracksPrefs.h" -#include "../Experimental.h" - //#include //#include diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index ba90f782b..9880f281e 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -33,8 +33,6 @@ #include "../Audacity.h" // for USE_* macros #include "ControlToolBar.h" -#include "../Experimental.h" - #include #include diff --git a/src/toolbars/EditToolBar.cpp b/src/toolbars/EditToolBar.cpp index 914dd2794..5bf259cb8 100644 --- a/src/toolbars/EditToolBar.cpp +++ b/src/toolbars/EditToolBar.cpp @@ -33,8 +33,6 @@ #include "../Audacity.h" #include "EditToolBar.h" -#include "../Experimental.h" - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/toolbars/EditToolBar.h b/src/toolbars/EditToolBar.h index 4ce0bba17..5b0b5e266 100644 --- a/src/toolbars/EditToolBar.h +++ b/src/toolbars/EditToolBar.h @@ -14,8 +14,6 @@ #ifndef __AUDACITY_EDIT_TOOLBAR__ #define __AUDACITY_EDIT_TOOLBAR__ -#include "../Experimental.h" - #include #include "ToolBar.h" diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index 5123b4349..213157654 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -30,7 +30,6 @@ with changes in the SpectralSelectionBar. #include "SpectralSelectionBar.h" #include "SpectralSelectionBarListener.h" -#include "../Experimental.h" #include "ToolManager.h" #include diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp index 396fbc7c3..817fcd9d9 100644 --- a/src/toolbars/ToolBar.cpp +++ b/src/toolbars/ToolBar.cpp @@ -27,8 +27,6 @@ in which buttons can be placed. #include "../Audacity.h" // for USE_* macros #include "ToolBar.h" -#include "../Experimental.h" - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h index 227f9ada7..f6472a401 100644 --- a/src/toolbars/ToolBar.h +++ b/src/toolbars/ToolBar.h @@ -13,8 +13,6 @@ #ifndef __AUDACITY_TOOLBAR__ #define __AUDACITY_TOOLBAR__ -#include "../Experimental.h" - #include #include #include diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index a7978eecd..deed6fa56 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -27,7 +27,6 @@ #include "../Audacity.h" #include "ToolManager.h" -#include "../Experimental.h" #include "../commands/CommandContext.h" // For compilers that support precompilation, includes "wx/wx.h". diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index b58abe3fd..bcd01b0fe 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -18,8 +18,6 @@ #include "TranscriptionToolBar.h" #include "ToolManager.h" -#include "../Experimental.h" - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h index 40db8cd35..6d10226df 100644 --- a/src/toolbars/TranscriptionToolBar.h +++ b/src/toolbars/TranscriptionToolBar.h @@ -13,8 +13,6 @@ #ifndef __AUDACITY_TRANSCRIPTION_TOOLBAR__ #define __AUDACITY_TRANSCRIPTION_TOOLBAR__ -#include "../Experimental.h" - #include "ToolBar.h" #include // member variable diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp index f177f62ea..db2972d64 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #include "LabelTextHandle.h" #include "LabelTrackView.h" -#include "../../../Experimental.h" #include "../../../HitTestResult.h" #include "../../../LabelTrack.h" diff --git a/src/tracks/labeltrack/ui/LabelTrackView.cpp b/src/tracks/labeltrack/ui/LabelTrackView.cpp index 7ce0df96c..dacf7644e 100644 --- a/src/tracks/labeltrack/ui/LabelTrackView.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackView.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../Audacity.h" #include "LabelTrackView.h" -#include "../../../Experimental.h" - #include "LabelTrackVRulerControls.h" #include "LabelGlyphHandle.h" #include "LabelTextHandle.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp index e54552b05..a94f30e10 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp @@ -12,8 +12,6 @@ Paul Licameli split from TrackPanel.cpp #ifdef USE_MIDI #include "NoteTrackControls.h" -#include "../../../../Experimental.h" - #include "NoteTrackButtonHandle.h" #include "../../ui/PlayableTrackButtonHandles.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h index 935db5a38..24051a530 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h @@ -21,7 +21,6 @@ class NoteTrackButtonHandle; class VelocitySliderHandle; #include "../../../../Audacity.h" -#include "../../../../Experimental.h" using NoteTrackControlsBase = #ifdef EXPERIMENTAL_MIDI_OUT diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp index c0982c619..5239b2e6d 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp @@ -11,8 +11,6 @@ #include "../../../../Audacity.h" #include "NoteTrackSliderHandles.h" -#include "../../../../Experimental.h" - #ifdef EXPERIMENTAL_MIDI_OUT #include "NoteTrackControls.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h index 88b3254d3..bf25168ec 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h @@ -11,8 +11,6 @@ #ifndef __AUDACITY_NOTE_TRACK_SLIDER_HANDLES__ #define __AUDACITY_NOTE_TRACK_SLIDER_HANDLES__ -#include "../../../../Experimental.h" - #ifdef EXPERIMENTAL_MIDI_OUT #include "../../../ui/SliderHandle.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp index f0fd95b85..f10453401 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp @@ -23,7 +23,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../TrackPanelMouseEvent.h" #include "../../../../AColor.h" -#include "../../../../Experimental.h" #include "../../../../TrackPanelDrawingContext.h" #include "../../../../widgets/Ruler.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp index 0fe099529..7954e0369 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -12,8 +12,6 @@ Paul Licameli split from TrackPanel.cpp #ifdef USE_MIDI #include "NoteTrackVZoomHandle.h" -#include "../../../../Experimental.h" - #include "../../../ui/TrackVRulerControls.h" #include "../../../../HitTestResult.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp index 655d2631d..aeac09fb0 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp @@ -14,8 +14,6 @@ Paul Licameli split from TrackPanel.cpp #ifdef USE_MIDI #include "../lib-src/header-substitutes/allegro.h" -#include "../../../../Experimental.h" - #include "NoteTrackVRulerControls.h" #include "../../../../NoteTrack.h" diff --git a/src/tracks/playabletrack/ui/PlayableTrackControls.cpp b/src/tracks/playabletrack/ui/PlayableTrackControls.cpp index 03879066e..2b0bc053b 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackControls.cpp +++ b/src/tracks/playabletrack/ui/PlayableTrackControls.cpp @@ -11,7 +11,6 @@ Paul Licameli split from TrackInfo.cpp #include "PlayableTrackControls.h" #include "../../../Audacity.h" -#include "../../../Experimental.h" #include "PlayableTrackButtonHandles.h" #include "../../../AColor.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp index 09535250b..a62fd7bb2 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "CutlineHandle.h" -#include "../../../../Experimental.h" - #include "../../../../HitTestResult.h" #include "../../../../ProjectAudioIO.h" #include "../../../../ProjectHistory.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp index f327a32d1..1c395b543 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "SampleHandle.h" -#include "../../../../Experimental.h" - #include #include diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp index fe6c754b7..b407e6ef8 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp @@ -13,8 +13,6 @@ Paul Licameli split from WaveTrackVZoomHandle.cpp #include "WaveTrackVZoomHandle.h" -#include "../../../../Experimental.h" - #include "../../../../HitTestResult.h" #include "../../../../NumberScale.h" #include "../../../../Prefs.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp index 52f08c31c..e8aebfe5b 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp @@ -11,8 +11,6 @@ Paul Licameli split from WaveTrackView.cpp #include "../../../../Audacity.h" #include "SpectrumView.h" -#include "../../../../Experimental.h" - #include "SpectrumVRulerControls.h" #include "WaveTrackView.h" #include "WaveTrackViewConstants.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp index 2887e4423..a41adf8a2 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "WaveTrackControls.h" -#include "../../../../Experimental.h" - #include "../../ui/PlayableTrackButtonHandles.h" #include "WaveTrackSliderHandles.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp index d5df9ce46..d555197e9 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "WaveTrackVRulerControls.h" -#include "../../../../Experimental.h" - #include "../../../../RefreshCode.h" #include "../../../../TrackPanelMouseEvent.h" #include "../../../../WaveTrack.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp index 19c2ea798..e06922f12 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../Audacity.h" #include "WaveTrackVZoomHandle.h" -#include "../../../../Experimental.h" - #include "../../../ui/TrackVRulerControls.h" #include "../../../../HitTestResult.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp index ae4b2547c..fb91fd388 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp @@ -14,8 +14,6 @@ Paul Licameli split from TrackPanel.cpp #include "CutlineHandle.h" -#include "../../../../Experimental.h" - #include #include #include diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp index c895ed901..00ddb1645 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp @@ -13,8 +13,6 @@ Paul Licameli split from WaveTrackVZoomHandle.cpp #include "WaveTrackVZoomHandle.h" -#include "../../../../Experimental.h" - #include "../../../../HitTestResult.h" #include "../../../../NumberScale.h" #include "../../../../Prefs.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp index c31f53ab3..d81ee8f38 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp @@ -11,8 +11,6 @@ Paul Licameli split from WaveTrackView.cpp #include "../../../../Audacity.h" #include "WaveformView.h" -#include "../../../../Experimental.h" - #include "WaveformVRulerControls.h" #include "WaveTrackView.h" #include "WaveTrackViewConstants.h" diff --git a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp index 7e4206248..b2bf98e82 100644 --- a/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp +++ b/src/tracks/timetrack/ui/TimeTrackVZoomHandle.cpp @@ -13,8 +13,6 @@ Paul Licameli split from TimeTrackVZoomHandle.cpp #include "TimeTrackVRulerControls.h" #include "TimeTrackControls.h" -#include "../../../Experimental.h" - #include "../../../HitTestResult.h" #include "../../../NumberScale.h" #include "../../../Prefs.h" diff --git a/src/tracks/timetrack/ui/TimeTrackView.cpp b/src/tracks/timetrack/ui/TimeTrackView.cpp index 909cc65be..6c2c8cc7f 100644 --- a/src/tracks/timetrack/ui/TimeTrackView.cpp +++ b/src/tracks/timetrack/ui/TimeTrackView.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "TimeTrackView.h" #include "../../../TimeTrack.h" -#include "../../../Experimental.h" - #include "TimeTrackControls.h" #include "TimeTrackVRulerControls.h" diff --git a/src/tracks/ui/EnvelopeHandle.cpp b/src/tracks/ui/EnvelopeHandle.cpp index 8a246f2a2..b907f2877 100644 --- a/src/tracks/ui/EnvelopeHandle.cpp +++ b/src/tracks/ui/EnvelopeHandle.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "EnvelopeHandle.h" -#include "../../Experimental.h" - #include "TrackView.h" #include "../../Envelope.h" diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index b891fc2d5..78fb2b9dc 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "Scrubbing.h" -#include "../../Experimental.h" - #include #include "../../AudioIO.h" diff --git a/src/tracks/ui/Scrubbing.h b/src/tracks/ui/Scrubbing.h index 6e2376557..4da21e2a0 100644 --- a/src/tracks/ui/Scrubbing.h +++ b/src/tracks/ui/Scrubbing.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_SCRUBBING__ #include "../../Audacity.h" -#include "../../Experimental.h" #include #include diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp index 59bcbf3ce..9f7c97de2 100644 --- a/src/tracks/ui/SelectHandle.cpp +++ b/src/tracks/ui/SelectHandle.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" #include "SelectHandle.h" -#include "../../Experimental.h" - #include "Scrubbing.h" #include "TrackView.h" diff --git a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp index 61e52a950..1059796d7 100644 --- a/src/tracks/ui/TimeShiftHandle.cpp +++ b/src/tracks/ui/TimeShiftHandle.cpp @@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../Audacity.h" // for USE_* macros #include "TimeShiftHandle.h" -#include "../../Experimental.h" - #include "TrackView.h" #include "../../AColor.h" #include "../../HitTestResult.h" diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp index 03b6291c4..bc2286a11 100644 --- a/src/widgets/ASlider.cpp +++ b/src/widgets/ASlider.cpp @@ -32,8 +32,6 @@ or ASlider. #include "../Audacity.h" #include "ASlider.h" -#include "../Experimental.h" - #include #include // for wxUSE_* macros diff --git a/src/widgets/ExpandingToolBar.cpp b/src/widgets/ExpandingToolBar.cpp index e56ae8905..2d213f215 100644 --- a/src/widgets/ExpandingToolBar.cpp +++ b/src/widgets/ExpandingToolBar.cpp @@ -65,8 +65,6 @@ ExpandingToolBar. #include "ExpandingToolBar.h" -#include "../Experimental.h" - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index 3abf7133f..fa274f217 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -22,8 +22,6 @@ #include "../Audacity.h" // for USE_* macros #include "HelpSystem.h" -#include "../Experimental.h" - #include // for wxUSE_* macros #include #include diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index a977e2d71..494d765fa 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -41,8 +41,6 @@ #include "../Audacity.h" // for USE_* macros #include "Meter.h" -#include "../Experimental.h" - #include #include // for wxUSE_* macros #include diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index 93c7cc880..56207ea77 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -57,8 +57,6 @@ array of Ruler::Label. #include "../Audacity.h" #include "Ruler.h" -#include "../Experimental.h" - #include #include diff --git a/win/audacity.rc b/win/audacity.rc index fcdef6d76..2e3e4f4aa 100644 --- a/win/audacity.rc +++ b/win/audacity.rc @@ -1,6 +1,4 @@ -#define IN_RC #include "Audacity.h" -#include "Experimental.h" #ifdef EXPERIMENTAL_DA AudacityLogo ICON "darkaudacity.ico"