Experimental.h safety

src/AllThemeResources.h

@@ -44,6 +44,7 @@ from there.  Audacity will look for a file called "Pause.png".
 // Note: No '#ifndef/#define' pair on this header file.
 // we want to include it multiple times in Theme.cpp.
 
+#include "Experimental.h"
 #include "MacroMagic.h"
 #define XPMS_RETIRED
 

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 <wx/debugrpt.h>
 #include <wx/evtloop.h>

src/AudacityLogger.cpp

@@ -26,6 +26,7 @@ Provides thread-safe logging based on the wxWidgets log facility.
 #include <wx/settings.h>
 
 #include "../images/AudacityLogoAlpha.xpm"
+#include "Experimental.h"
 
 //
 // AudacityLogger class

src/AudioIO.cpp

@@ -318,7 +318,7 @@ writing audio.
    #include "NoteTrack.h"
 #endif
 
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    #define LOWER_BOUND 0.0
    #define UPPER_BOUND 1.0
 #endif
@@ -876,7 +876,7 @@ AudioIO::AudioIO()
    mNumPauseFrames = 0;
 #endif
 
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    mAILAActive = false;
 #endif
    mSilentBuf = NULL;
@@ -1811,7 +1811,7 @@ int AudioIO::StartStream(WaveTrackArray playbackTracks,
       }
    }
 
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    AILASetStartTime();
 #endif
 
@@ -3769,7 +3769,7 @@ void AudioIO::AllNotesOff()
 #endif
 
 // Automated Input Level Adjustment - Automatically tries to find an acceptable input volume
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
 void AudioIO::AILAInitialize() {
    gPrefs->Read(wxT("/AudioIO/AutomatedInputLevelAdjustment"), &mAILAActive,         false);
    gPrefs->Read(wxT("/AudioIO/TargetPeak"),            &mAILAGoalPoint,      AILA_DEF_TARGET_PEAK);

src/AudioIO.h

@@ -67,7 +67,7 @@ class AudioIOListener;
 #define DEFAULT_LATENCY_DURATION 100.0
 #define DEFAULT_LATENCY_CORRECTION -130.0
 
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    #define AILA_DEF_TARGET_PEAK 92
    #define AILA_DEF_DELTA_PEAK 2
    #define AILA_DEF_ANALYSIS_TIME 1000
@@ -393,7 +393,7 @@ class AUDACITY_DLL_API AudioIO {
    /** \brief Function to automatically set an acceptable volume
     *
     */
-   #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+   #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
       void AILAInitialize();
       void AILADisable();
       bool AILAIsActive();
@@ -551,7 +551,7 @@ private:
    NoteTrackArray   mMidiPlaybackTracks;
 #endif
 
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    bool           mAILAActive;
    bool           mAILAClipped;
    int            mAILATotalAnalysis;

src/DeviceChange.cpp

@@ -15,6 +15,8 @@
 
 #include "DeviceChange.h"
 
+#include "Experimental.h"
+
 #if defined(EXPERIMENTAL_DEVICE_CHANGE_HANDLER)
 
 #if defined(HAVE_DEVICE_CHANGE)

src/DeviceManager.cpp

@@ -37,6 +37,8 @@
 #include "DeviceManager.h"
 #include "toolbars/DeviceToolBar.h"
 
+#include "Experimental.h"
+
 DeviceManager DeviceManager::dm;
 
 /// Gets the singleton instance

src/DeviceManager.h

@@ -18,6 +18,8 @@
 #ifndef __AUDACITY_DEVICEMANAGER__
 #define __AUDACITY_DEVICEMANAGER__
 
+#include "Experimental.h"
+
 #include <vector>
 #include "wx/wx.h"
 

src/Diags.cpp

@@ -36,7 +36,6 @@ count down so that we track how many times the event happens.
 
 #include <wx/stopwatch.h>
 #include "Diags.h"
-#include "Experimental.h"
 
 static wxStopWatch MasterWatch;
 static bool bStopWatchStarted = false;

src/Experimental.h

@@ -63,7 +63,7 @@
 //#define EXPERIMENTAL_EXTRA_MONITORING
 
 //#define EXPERIMENTAL_ROLL_UP_DIALOG
-//#define RIGHT_ALIGNED_TEXTBOXES
+//#define EXPERIMENTAL_RIGHT_ALIGNED_TEXTBOXES
 //#define EXPERIMENTAL_VOICE_DETECTION
 
 // Effect categorisation. Adds support for arranging effects in categories
@@ -74,8 +74,6 @@
 // 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.
 // 
-// All code removed after 2.1.0 release since it was unmaintained. LLL
-//#define EFFECT_CATEGORIES
 
 // JKC Apr 2015, Menu item to manage effects.
 #define EXPERIMENTAL_EFFECT_MANAGEMENT
@@ -139,7 +137,7 @@
 
 #if USE_PORTMIXER
    //Automatically tries to find an acceptable input volume
-   //#define AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+   //#define EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
 #endif
 
 // John (Thales) work to make the display show the result of the pan and gain sliders, rather than their input.

src/FFT.cpp

@@ -46,6 +46,8 @@
 #include <stdio.h>
 #include <math.h>
 
+#include "Experimental.h"
+
 static int **gFFTBitTable = NULL;
 static const int MaxFastBits = 16;
 

src/FFmpeg.cpp

@@ -26,6 +26,8 @@ License: GPL v2.  See License.txt.
 
 #include <wx/file.h>
 
+#include "Experimental.h"
+
 #if !defined(USE_FFMPEG)
 /// FFmpeg support may or may not be compiled in,
 /// but Preferences dialog requires this function nevertheless

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 {

src/LyricsWindow.cpp

@@ -9,8 +9,6 @@
 
 **********************************************************************/
 
-#include "Experimental.h"
-
 #include "LyricsWindow.h"
 #include "Lyrics.h"
 #include "AudioIO.h"

src/Menus.cpp

@@ -820,7 +820,7 @@ void AudacityProject::CreateMenusAndCommands()
    c->AddCheck(wxT("SoundActivation"), _("Sound A&ctivated Recording (on/off)"), FN(OnToggleSoundActivated), 0);
    c->AddItem(wxT("SoundActivationLevel"), _("Sound Activation Le&vel..."), FN(OnSoundActivated));
 
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    c->AddCheck(wxT("AutomatedInputLevelAdjustmentOnOff"), _("A&utomated Recording Level Adjustment (on/off)"), FN(OnToogleAutomatedInputLevelAdjustment), 0);
 #endif
    c->AddItem(wxT("RescanDevices"), _("R&escan Audio Devices"), FN(OnRescanDevices));
@@ -1847,7 +1847,7 @@ void AudacityProject::ModifyToolbarMenus()
    bool active;
    gPrefs->Read(wxT("/AudioIO/SoundActivatedRecord"),&active, false);
    mCommandManager.Check(wxT("SoundActivation"), active);
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    gPrefs->Read(wxT("/AudioIO/AutomatedInputLevelAdjustment"),&active, false);
    mCommandManager.Check(wxT("AutomatedInputLevelAdjustmentOnOff"), active);
 #endif
@@ -2363,7 +2363,7 @@ void AudacityProject::OnToggleSWPlaythrough()
    ModifyAllProjectToolbarMenus();
 }
 
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
 void AudacityProject::OnToogleAutomatedInputLevelAdjustment()
 {
    bool AVEnabled;

src/Menus.h

@@ -308,7 +308,7 @@ void OnSoundActivated();
 void OnToggleSoundActivated();
 void OnTogglePlayRecording();
 void OnToggleSWPlaythrough();
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    void OnToogleAutomatedInputLevelAdjustment();
 #endif
 void OnRescanDevices();

src/ModuleManager.cpp

@@ -47,6 +47,8 @@ i.e. an alternative to the usual interface, for Audacity.
 
 #include <wx/arrimpl.cpp>
 
+#include "Experimental.h"
+
 #define initFnName      "ExtensionModuleInit"
 #define versionFnName   "GetVersionString"
 #define scriptFnName    "RegScriptServerFunc"

src/NoteTrack.cpp

@@ -33,6 +33,8 @@
 #include "Prefs.h"
 #include "effects/TimeWarper.h"
 
+#include "Experimental.h"
+
 #ifdef SONIFY
 #include "portmidi.h"
 

src/PluginManager.cpp

@@ -48,6 +48,8 @@
 
 #include <wx/arrimpl.cpp>
 
+#include "Experimental.h"
+
 WX_DECLARE_STRING_HASH_MAP(wxArrayString, ProviderMap);
 
 // ============================================================================

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;

src/RealFFTf.h

@@ -1,6 +1,8 @@
 #ifndef __realfftf_h
 #define __realfftf_h
 
+#include "Experimental.h"
+
 #define fft_type float
 struct FFTParam {
    int *BitReversed;

src/Resample.cpp

@@ -23,6 +23,7 @@
 *//*******************************************************************/
 
 #include "Resample.h"
+#include "Prefs.h"
 
 #include <soxr.h>
 
@@ -100,3 +101,11 @@ int Resample::Process(double  factor,
    *inBufferUsed = (int)idone;
    return (int)odone;
 }
+
+void Resample::SetMethod(const bool useBestMethod)
+{
+   if (useBestMethod)
+      mMethod = gPrefs->Read(GetBestMethodKey(), GetBestMethodDefault());
+   else
+      mMethod = gPrefs->Read(GetFastMethodKey(), GetFastMethodDefault());
+}

src/Resample.h

@@ -17,7 +17,6 @@
 #include <wx/intl.h>
 #include <wx/string.h>
 
-#include "Prefs.h"
 #include "SampleFormat.h"
 
 class Resample
@@ -75,13 +74,7 @@ class Resample
                         int     outBufferLen);
 
  protected:
-   void SetMethod(const bool useBestMethod)
+   void SetMethod(const bool useBestMethod);
-   {
-      if (useBestMethod)
-         mMethod = gPrefs->Read(GetBestMethodKey(), GetBestMethodDefault());
-      else
-         mMethod = gPrefs->Read(GetFastMethodKey(), GetFastMethodDefault());
-   };
 
  protected:
    int   mMethod; // resampler-specific enum for resampling method

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");
 

src/ShuttleGui.cpp

@@ -502,7 +502,7 @@ wxTextCtrl * ShuttleGuiBase::AddTextBox(const wxString &Caption, const wxString
    AddPrompt( Caption );
    miProp=0;
 
-#ifdef RIGHT_ALIGNED_TEXTBOXES
+#ifdef EXPERIMENTAL_RIGHT_ALIGNED_TEXTBOXES
    long flags = wxTE_RIGHT;
 #else
    long flags = wxTE_LEFT;
@@ -529,7 +529,7 @@ wxTextCtrl * ShuttleGuiBase::AddNumericTextBox(const wxString &Caption, const wx
    AddPrompt( Caption );
    miProp=0;
 
-#ifdef RIGHT_ALIGNED_TEXTBOXES
+#ifdef EXPERIMENTAL_RIGHT_ALIGNED_TEXTBOXES
    long flags = wxTE_RIGHT;
 #else
    long flags = wxTE_LEFT;

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,

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 )

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__

src/WaveClip.cpp

@@ -38,6 +38,9 @@
 #include "prefs/SpectrogramSettings.h"
 
 #include <wx/listimpl.cpp>
+
+#include "Experimental.h"
+
 WX_DEFINE_LIST(WaveClipList);
 
 class WaveCache {

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

src/commands/CommandManager.cpp

@@ -115,6 +115,8 @@ CommandManager.  It holds the callback for one command.
 #include <gtk/gtk.h>
 #endif
 
+#include "../Experimental.h"
+
 // Shared by all projects
 static class CommandManagerEventMonitor : public wxEventFilter
 {

src/commands/CommandManager.h

@@ -12,6 +12,8 @@
 #ifndef __AUDACITY_COMMAND_MANAGER__
 #define __AUDACITY_COMMAND_MANAGER__
 
+#include "../Experimental.h"
+
 #include <wx/string.h>
 #include <wx/dynarray.h>
 #include <wx/menu.h>

src/effects/Effect.cpp

@@ -54,6 +54,8 @@ greater use in future.
 #include <Cocoa/Cocoa.h>
 #endif
 
+#include "../Experimental.h"
+
 static const int kDummyID = 20000;
 static const int kSaveAsID = 20001;
 static const int kImportID = 20002;

src/effects/EffectManager.h

@@ -21,6 +21,8 @@ effects.
 #ifndef __AUDACITY_EFFECTMANAGER__
 #define __AUDACITY_EFFECTMANAGER__
 
+#include "../Experimental.h"
+
 #include <wx/choice.h>
 #include <wx/dialog.h>
 #include <wx/event.h>

src/effects/Equalization.h

@@ -15,6 +15,8 @@
 #define NUM_PTS 180
 #define PANELBORDER 1   // only increase from '1' for testing purposes - MJS
 
+#include "../Experimental.h"
+
 #include <wx/button.h>
 #include <wx/panel.h>
 #include <wx/dialog.h>

src/effects/LoadEffects.cpp

@@ -57,6 +57,8 @@
 #include "ChangeTempo.h"
 #endif
 
+#include "../Experimental.h"
+
 //
 // Include the SoundTouch effects, if requested
 //

src/effects/NoiseRemoval.h

@@ -14,6 +14,8 @@
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #if !defined(EXPERIMENTAL_NOISE_REDUCTION)
 
 #include "Effect.h"

src/effects/Phaser.cpp

@@ -29,6 +29,7 @@
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
+#include "../Experimental.h"
 
 enum
 {

src/effects/Wahwah.cpp

@@ -28,6 +28,8 @@
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
+#include "../Experimental.h"
+
 enum
 {
    ID_Freq = 10000,

src/effects/nyquist/Nyquist.cpp

@@ -68,6 +68,8 @@ effects from this one class.
 #include <sstream>
 #include <float.h>
 
+#include "../../Experimental.h"
+
 enum
 {
    ID_Editor = 10000,

src/import/ImportFFmpeg.cpp

@@ -31,6 +31,8 @@ Licensed under the GNU General Public License v2 or later
 #include <wx/window.h>
 #endif
 
+#include "../Experimental.h"
+
 
 #define DESC _("FFmpeg-compatible files")
 

src/import/ImportFLAC.cpp

@@ -40,6 +40,8 @@
 
 #include "../Tags.h"
 
+#include "../Experimental.h"
+
 #define FLAC_HEADER "fLaC"
 
 #define DESC _("FLAC files")
@@ -94,8 +96,6 @@ extern "C" {
 #endif
 
 
-//#define EXPERIMENTAL_OD_FLAC
-
 class FLACImportFileHandle;
 
 class MyFLACFile : public FLAC::Decoder::File

src/prefs/EffectsPrefs.cpp

@@ -29,6 +29,8 @@
 
 #include "EffectsPrefs.h"
 
+#include "../Experimental.h"
+
 EffectsPrefs::EffectsPrefs(wxWindow * parent)
 :  PrefsPanel(parent, _("Effects"))
 {

src/prefs/GUIPrefs.cpp

@@ -29,6 +29,8 @@
 
 #include "GUISettings.h"
 
+#include "../Experimental.h"
+
 GUIPrefs::GUIPrefs(wxWindow * parent)
 :  PrefsPanel(parent, _("Interface"))
 {

src/prefs/KeyConfigPrefs.h

@@ -12,6 +12,8 @@
 #ifndef __AUDACITY_KEY_CONFIG_PREFS__
 #define __AUDACITY_KEY_CONFIG_PREFS__
 
+#include "../Experimental.h"
+
 class ShuttleGui;
 
 #if defined(EXPERIMENTAL_KEY_VIEW)

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

src/prefs/RecordingPrefs.cpp

@@ -30,6 +30,8 @@
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 
+#include "../Experimental.h"
+
 using std::min;
 
 RecordingPrefs::RecordingPrefs(wxWindow * parent)
@@ -123,7 +125,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
    }
    S.EndStatic();
 
-   #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+   #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
       S.StartStatic(_("Automated Recording Level Adjustment"));
       {
          S.TieCheckBox(_("Enable Automated Recording Level Adjustment."),
@@ -180,7 +182,7 @@ bool RecordingPrefs::Apply()
       gPrefs->Write(wxT("/AudioIO/LatencyDuration"), DEFAULT_LATENCY_DURATION);
    }
 
-   #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+   #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
       double targetpeak, deltapeak;
       gPrefs->Read(wxT("/AudioIO/TargetPeak"),  &targetpeak);
       gPrefs->Read(wxT("/AudioIO/DeltaPeakVolume"), &deltapeak);

src/prefs/SpectrogramSettings.cpp

@@ -27,6 +27,8 @@ Paul Licameli
 
 #include <cmath>
 
+#include "../Experimental.h"
+
 SpectrogramSettings::Globals::Globals()
 {
    LoadPrefs();

src/prefs/SpectrumPrefs.cpp

@@ -30,6 +30,8 @@
 
 #include <algorithm>
 
+#include "../Experimental.h"
+
 SpectrumPrefs::SpectrumPrefs(wxWindow * parent, WaveTrack *wt)
 :  PrefsPanel(parent, wt ? _("Spectrogram Settings") : _("Spectrograms"))
 , mWt(wt)

src/prefs/TracksPrefs.cpp

@@ -28,6 +28,8 @@
 #include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 
+#include "../Experimental.h"
+
 ////////////////////////////////////////////////////////////////////////////////
 
 TracksPrefs::TracksPrefs(wxWindow * parent)

src/toolbars/ControlToolBar.cpp

@@ -746,7 +746,7 @@ void ControlToolBar::StopPlaying(bool stopStream /* = true*/)
    SetPlay(false);
    SetRecord(false);
 
-   #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+   #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
       gAudioIO->AILADisable();
    #endif
 
@@ -929,7 +929,7 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
       }
 
       //Automated Input Level Adjustment Initialization
-      #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+      #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
          gAudioIO->AILAInitialize();
       #endif
          

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;

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);

src/toolbars/ToolManager.cpp

@@ -68,6 +68,8 @@
 #include "../widgets/AButton.h"
 #include "../widgets/Grabber.h"
 
+#include "../Experimental.h"
+
 ////////////////////////////////////////////////////////////
 /// Methods for ToolFrame
 ////////////////////////////////////////////////////////////

src/toolbars/ToolsToolBar.cpp

@@ -58,6 +58,8 @@
 #include "../Theme.h"
 #include "../widgets/AButton.h"
 
+#include "../Experimental.h"
+
 IMPLEMENT_CLASS(ToolsToolBar, ToolBar);
 
 ////////////////////////////////////////////////////////////

src/toolbars/TranscriptionToolBar.h

@@ -14,6 +14,7 @@
 #define __AUDACITY_TRANSCRIPTION_TOOLBAR__
 
 #include "ToolBar.h"
+#include "../Experimental.h"
 
 #include <wx/brush.h>
 #include <wx/pen.h>

src/widgets/ASlider.h

@@ -13,6 +13,8 @@
 #ifndef __AUDACITY_SLIDER__
 #define __AUDACITY_SLIDER__
 
+#include "../Experimental.h"
+
 #include <wx/defs.h>
 #include <wx/window.h>
 #include <wx/dialog.h>

src/widgets/Meter.cpp

@@ -959,7 +959,7 @@ void Meter::OnMeterUpdate(wxTimerEvent & WXUNUSED(event))
 {
    MeterUpdateMsg msg;
    int numChanges = 0;
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
    double maxPeak = 0.0;
    bool discarded = false;
 #endif
@@ -1027,7 +1027,7 @@ void Meter::OnMeterUpdate(wxTimerEvent & WXUNUSED(event))
          }
 
          mBar[j].tailPeakCount = msg.tailPeakCount[j];
-#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+#ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
          if (mT > gAudioIO->AILAGetLastDecisionTime()) {
             discarded = false;
             maxPeak = msg.peak[j] > maxPeak ? msg.peak[j] : maxPeak;
@@ -1042,7 +1042,7 @@ void Meter::OnMeterUpdate(wxTimerEvent & WXUNUSED(event))
    } // while
 
    if (numChanges > 0) {
-      #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+      #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
          if (gAudioIO->AILAIsActive() && mIsInput && !discarded) {
             gAudioIO->AILAProcess(maxPeak);
             putchar('\n');