Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-10 17:11:17 +02:00
Code Issues Releases Wiki Activity

Uniform naming of symbols in Experimental.h

Browse Source
This commit is contained in:
Paul Licameli 2015-08-31 15:32:33 -04:00
parent d18553a3f0
commit 1278b9644a
9 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/AudioIO.cpp
View File

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

6
src/AudioIO.h
View File

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

6
src/Experimental.h
View File

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

6
src/Menus.cpp
View File

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

2
src/Menus.h
View File

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

4
src/ShuttleGui.cpp
View File

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

4
src/prefs/RecordingPrefs.cpp
View File

@ -123,7 +123,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
} }
S.EndStatic(); S.EndStatic();
#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
S.StartStatic(_("Automated Recording Level Adjustment")); S.StartStatic(_("Automated Recording Level Adjustment"));
{ {
S.TieCheckBox(_("Enable 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); gPrefs->Write(wxT("/AudioIO/LatencyDuration"), DEFAULT_LATENCY_DURATION);
} }
#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
double targetpeak, deltapeak; double targetpeak, deltapeak;
gPrefs->Read(wxT("/AudioIO/TargetPeak"), &targetpeak); gPrefs->Read(wxT("/AudioIO/TargetPeak"), &targetpeak);
gPrefs->Read(wxT("/AudioIO/DeltaPeakVolume"), &deltapeak); gPrefs->Read(wxT("/AudioIO/DeltaPeakVolume"), &deltapeak);

4
src/toolbars/ControlToolBar.cpp
View File

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

6
src/widgets/Meter.cpp
View File

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