Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26192
Modified Files:
AudioIO.cpp
Log Message:
Do not reference meters if they've been deleted
Index: AudioIO.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- AudioIO.cpp 23 May 2007 06:37:56 -0000 1.157
+++ AudioIO.cpp 23 May 2007 23:26:38 -0000 1.158
@@ -2178,14 +2178,17 @@
gAudioIO->mUpdatingMeters = true;
if (gAudioIO->mUpdateMeters) {
- if (!gAudioIO->mOutputMeter->IsMeterDisabled()
- && gAudioIO->mOutputMeter && outputBuffer)
+ if (gAudioIO->mOutputMeter &&
+ !gAudioIO->mOutputMeter->IsMeterDisabled() &&
+ outputBuffer) {
gAudioIO->mOutputMeter->UpdateDisplay(numPlaybackChannels,
framesPerBuffer,
(float *)outputBuffer);
+ }
- if (!gAudioIO->mInputMeter->IsMeterDisabled()
- && gAudioIO->mInputMeter && inputBuffer) {
+ if (gAudioIO->mInputMeter &&
+ !gAudioIO->mInputMeter->IsMeterDisabled() &&
+ inputBuffer) {
if (gAudioIO->mCaptureFormat == floatSample)
gAudioIO->mInputMeter->UpdateDisplay(numCaptureChannels,
framesPerBuffer,
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
