[Audacity-cvs] audacity-src/src/widgets Meter.cpp, 1.51, 1.52 Meter.h, 1.17, 1.18

[André Pinto]

Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9984/widgets

Modified Files:
        Meter.cpp Meter.h 
Log Message:
Rolling back to the old clipping behaviour.
Added isclipping boolean to MeterBar to use on AV.

Index: Meter.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Meter.h     25 Jul 2009 17:17:13 -0000      1.17
+++ Meter.h     26 Jul 2009 21:45:41 -0000      1.18
@@ -37,6 +37,7 @@
    double peakHoldTime;
    wxRect rClip;
    bool   clipping;
+   bool   isclipping;
    int    tailPeakCount;
    float  peakPeakHold;
 };

Index: Meter.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Meter.cpp   26 Jul 2009 01:56:43 -0000      1.51
+++ Meter.cpp   26 Jul 2009 21:45:41 -0000      1.52
@@ -286,8 +286,10 @@
 
    mTimer.SetOwner(this, OnMeterUpdateID);
    Reset(44100.0, true);
-   for(i=0; i<kMaxMeterBars; i++)
+   for(i=0; i<kMaxMeterBars; i++) {
       mBar[i].clipping = false;
+      mBar[i].isclipping = false;
+   }
 }
 
 void Meter::CreateIcon(int aquaOffset)
@@ -628,7 +630,8 @@
 
       mT += deltaT;
       for(j=0; j<mNumBars; j++) {
-         mBar[j].clipping = false;
+         mBar[j].isclipping = false;
+
          if (mDecay) {
             if (mDB) {
                float decayAmount = mDecayRate * deltaT / mDBRange;
@@ -660,8 +663,10 @@
          
          if (msg.clipping[j] ||
              mBar[j].tailPeakCount+msg.headPeakCount[j] >=
-             mNumPeakSamplesToClip)
+             mNumPeakSamplesToClip){
             mBar[j].clipping = true;
+            mBar[j].isclipping = true;
+         }
 
          mBar[j].tailPeakCount = msg.tailPeakCount[j];
       }
@@ -703,13 +708,14 @@
       b->clipping = false;
       b->peakPeakHold =0.0;
    }
+   b->isclipping = false;
    b->tailPeakCount = 0;
 }
 
 bool Meter::IsClipping()
 {
    for (int c = 0; c < kMaxMeterBars; c++)
-      if (mBar[c].clipping)
+      if (mBar[c].isclipping)
          return true;
    return false;
 }


------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs