From 880b1b8c4b3490244a8d2fd24363ea874c5c16f1 Mon Sep 17 00:00:00 2001
From: "v.audacity" <v.audacity@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sat, 26 Feb 2011 23:19:19 +0000
Subject: [PATCH] Bug 258 (P2) - Mixer Board: max peak and clipping lines
 removed

Update comments to reflect sticking with this fix, per http://bugzilla.audacityteam.org/show_bug.cgi?id=258#c13.
---
 src/AudioIO.cpp    | 8 +++++---
 src/MixerBoard.cpp | 5 ++---
 src/TrackPanel.cpp | 7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index 642fc910e..a9deaa444 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -3648,9 +3648,11 @@ int audacityAudioCallback(const void *inputBuffer, void *outputBuffer,
                                                framesPerBuffer,
                                                outputMeterFloats);
 
-         //vvv Vaughan, 2011-02-25: Move this update back to 
-         //    TrackPanel::OnTimer() to see if it helps with 
-         //    playback issues reported by Bill and noted on Bug 258.
+         //v Vaughan, 2011-02-25: Moved this update back to TrackPanel::OnTimer() 
+         //    as it helps with playback issues reported by Bill and noted on Bug 258.
+         //    The problem there occurs if Software Playthrough is on. 
+         //    Could conditionally do the update here if Software Playthrough is off, 
+         //    and in TrackPanel::OnTimer() if Software Playthrough is on, but not now. 
          //AudacityProject* pProj = GetActiveProject();
          //MixerBoard* pMixerBoard = pProj->GetMixerBoard();
          //if (pMixerBoard)
diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
index b83f23cf1..b5354e9b7 100644
--- a/src/MixerBoard.cpp
+++ b/src/MixerBoard.cpp
@@ -419,9 +419,8 @@ void MixerTrackCluster::UpdateMeter(const double t0, const double t1)
    if ((t0 < 0.0) || (t1 < 0.0) || (t0 >= t1) || // bad time value or nothing to show
          ((mMixerBoard->HasSolo() || mLeftTrack->GetMute()) && !mLeftTrack->GetSolo()))
    {
-      //vvv Vaughan, 2011-02-25: Moved this update back to 
-      //    TrackPanel::OnTimer() to see if it helps with 
-      //    playback issues reported by Bill and noted on Bug 258.
+      //v Vaughan, 2011-02-25: Moved the update back to TrackPanel::OnTimer() as it helps with 
+      //    playback issues reported by Bill and noted on Bug 258, so no assert.
       // Vaughan, 2011-02-04: Now that we're updating all meters from audacityAudioCallback, 
       //    this causes an assert if you click Mute while playing, because ResetMeter() resets 
       //    the timer, and wxTimerbase says that can only be done from main thread -- 
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 68c9c014a..7e61bfa04 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -883,7 +883,8 @@ void TrackPanel::OnTimer()
       }
    }
 
-   //vvv Vaughan, 2011-02-25: Move this update back here from audacityAudioCallback.
+   //v Vaughan, 2011-02-25: Moved this update back here from audacityAudioCallback.
+   //    See note there. 
    // Vaughan, 2010-01-30: 
    //    Since all we're doing here is updating the meters, I moved it to 
    //    audacityAudioCallback where it calls gAudioIO->mOutputMeter->UpdateDisplay().
@@ -5345,7 +5346,7 @@ double TrackPanel::GetMostRecentXPos()
 
 void TrackPanel::RefreshTrack(Track *trk, bool refreshbacking)
 {
-   //vvv Vaughan, 2011-02-04:
+   //v Vaughan, 2011-02-04:
    //   Since Roger's fix is to not use r, no reason to declare or calculate it, or link.
    //Track *link = trk->GetLink();
    //
@@ -5368,7 +5369,7 @@ void TrackPanel::RefreshTrack(Track *trk, bool refreshbacking)
       mRefreshBacking = true;
    }
 
-   //vvv Vaughan, 2011-02-04:
+   //v Vaughan, 2011-02-04:
    //    Roger's patch for Bug 255 is to Refresh the whole TrackPanel. 
    //    We'll see if it's too much of a performance hit.
    //Refresh( false, &r );