Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23141/widgets
Modified Files:
Meter.cpp Meter.h
Log Message:
Changing Automatic Volume designation to Automated Input Level Adjustment.
Index: Meter.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Meter.h 10 Aug 2009 18:19:37 -0000 1.22
+++ Meter.h 28 Aug 2009 14:44:29 -0000 1.23
@@ -189,8 +189,8 @@
void OnDB(wxCommandEvent &evt);
void OnClip(wxCommandEvent &evt);
void OnMonitor(wxCommandEvent &evt);
-#ifdef AUTOMATIC_VOLUME
- void OnAutomaticVolume(wxCommandEvent &evt);
+#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+ void OnAutomatedInputLevelAdjustment(wxCommandEvent &evt);
#endif
void OnFloat(wxCommandEvent &evt);
void OnPreferences(wxCommandEvent &evt);
Index: Meter.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- Meter.cpp 16 Aug 2009 23:58:01 -0000 1.65
+++ Meter.cpp 28 Aug 2009 14:44:29 -0000 1.66
@@ -172,7 +172,7 @@
OnDisableMeterID,
OnMonitorID,
OnHorizontalID,
- OnAutomaticVolumeID,
+ OnAutomatedInputLevelAdjustmentID,
OnVerticalID,
OnMultiID,
OnEqualizerID,
@@ -200,8 +200,8 @@
EVT_MENU(OnDBID, Meter::OnDB)
EVT_MENU(OnClipID, Meter::OnClip)
EVT_MENU(OnMonitorID, Meter::OnMonitor)
-#ifdef AUTOMATIC_VOLUME
- EVT_MENU(OnAutomaticVolumeID, Meter::OnAutomaticVolume)
+#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+ EVT_MENU(OnAutomatedInputLevelAdjustmentID,
Meter::OnAutomatedInputLevelAdjustment)
#endif
EVT_MENU(OnFloatID, Meter::OnFloat)
EVT_MENU(OnPreferencesID, Meter::OnPreferences)
@@ -413,16 +413,16 @@
else
menu->Append(OnMonitorID, _("Start Monitoring"));
- #ifdef AUTOMATIC_VOLUME
- if (gAudioIO->AVIsActive())
- menu->Append(OnAutomaticVolumeID, _("Stop Automatic Volume"));
+ #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+ if (gAudioIO->AILAIsActive())
+ menu->Append(OnAutomatedInputLevelAdjustmentID, _("Stop
Automated Input Level Adjustment"));
else
- menu->Append(OnAutomaticVolumeID, _("Start Automatic Volume"));
+ menu->Append(OnAutomatedInputLevelAdjustmentID, _("Start
Automated Input Level Adjustment"));
bool AVActive;
- gPrefs->Read(wxT("/AudioIO/AutomaticVolumeRecord"), &AVActive,
false);
+ gPrefs->Read(wxT("/AudioIO/AutomatedInputLevelAdjustment"),
&AVActive, false);
if (!AVActive ||
!GetActiveProject()->GetControlToolBar()->IsRecordDown())
- menu->Enable(OnAutomaticVolumeID, false);
+ menu->Enable(OnAutomatedInputLevelAdjustmentID, false);
#endif
}
@@ -694,8 +694,8 @@
}
mBar[j].tailPeakCount = msg.tailPeakCount[j];
-#ifdef AUTOMATIC_VOLUME
- if (mT > gAudioIO->AVGetLastDecisionTime()) {
+#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+ if (mT > gAudioIO->AILAGetLastDecisionTime()) {
discarded = false;
maxPeak = msg.peak[j] > maxPeak ? msg.peak[j] : maxPeak;
printf("%...@%f ", msg.peak[j], mT);
@@ -709,9 +709,9 @@
} // while
if (numChanges > 0) {
- #ifdef AUTOMATIC_VOLUME
- if (gAudioIO->AVIsActive() && mIsInput && !discarded) {
- gAudioIO->AVProcess(maxPeak);
+ #ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+ if (gAudioIO->AILAIsActive() && mIsInput && !discarded) {
+ gAudioIO->AILAProcess(maxPeak);
putchar('\n');
}
#endif
@@ -1259,16 +1259,16 @@
StartMonitoring();
}
-#ifdef AUTOMATIC_VOLUME
-void Meter::OnAutomaticVolume(wxCommandEvent &evt)
+#ifdef AUTOMATED_INPUT_LEVEL_ADJUSTMENT
+void Meter::OnAutomatedInputLevelAdjustment(wxCommandEvent &evt)
{
- if (gAudioIO->AVIsActive()) {
- gAudioIO->AVDisable();
+ if (gAudioIO->AILAIsActive()) {
+ gAudioIO->AILADisable();
AudacityProject *p = GetActiveProject();
- if (p) p->TP_DisplayStatusMessage(_("Automatic Volume stopped as
requested by user."));
+ if (p) p->TP_DisplayStatusMessage(_("Automated Input Level Adjustment
stopped as requested by user."));
}
else
- gAudioIO->AVInitialize();
+ gAudioIO->AILAInitialize();
}
#endif
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
