From 1278b9644aa10217efeeefd3285072e04f52c953 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 31 Aug 2015 15:32:33 -0400 Subject: [PATCH] Uniform naming of symbols in Experimental.h --- src/AudioIO.cpp | 8 ++++---- src/AudioIO.h | 6 +++--- src/Experimental.h | 6 ++---- src/Menus.cpp | 6 +++--- src/Menus.h | 2 +- src/ShuttleGui.cpp | 4 ++-- src/prefs/RecordingPrefs.cpp | 4 ++-- src/toolbars/ControlToolBar.cpp | 4 ++-- src/widgets/Meter.cpp | 6 +++--- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index b0de6b4e0..b8e365981 100644 --- a/src/AudioIO.cpp +++ b/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); diff --git a/src/AudioIO.h b/src/AudioIO.h index d6fcc3284..9aac65a86 100644 --- a/src/AudioIO.h +++ b/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; diff --git a/src/Experimental.h b/src/Experimental.h index 3138930d7..9c1b9ba27 100644 --- a/src/Experimental.h +++ b/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. diff --git a/src/Menus.cpp b/src/Menus.cpp index 9011f7ec1..1adf07a72 100644 --- a/src/Menus.cpp +++ b/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; diff --git a/src/Menus.h b/src/Menus.h index a5fb81ae6..7cf44d4e4 100644 --- a/src/Menus.h +++ b/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(); diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index 52ce171cc..3d71f80e0 100644 --- a/src/ShuttleGui.cpp +++ b/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; diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index fcc054c0c..320bbb722 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -123,7 +123,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 +180,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); diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 4d179d861..f678e3ce0 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/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 diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index 0c9ca5bca..1bfb1743b 100644 --- a/src/widgets/Meter.cpp +++ b/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');