[Traverso-commit] traverso/src/core Peak.cpp Sheet.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/02/12 21:34:28

Modified files:
        src/core       : Peak.cpp Sheet.cpp 

Log message:
        * fix Peak generation issue for Microview when the file sample rate was 
!= 44100
        * Do not paint below zoomlevel 1:1, it's not supported  (yet) Do we 
need it actually ?

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.cpp?cvsroot=traverso&r1=1.21&r2=1.22

Patches:
Index: Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- Peak.cpp    22 Feb 2008 19:35:42 -0000      1.85
+++ Peak.cpp    12 Feb 2009 21:34:27 -0000      1.86
@@ -346,7 +346,10 @@
                float* peakdata = data->peakdataDecodeBuffer->readBuffer;
 
                ProcessData pd;
-               pd.stepSize = TimeRef(nframes_t(1), m_source->get_file_rate());
+               // the stepSize depends on the real file sample rate, Peak 
assumes 44100 Hz
+               // so if the file sample rate differs, the stepSize becomes the 
ratio of 
+               // the file sample rate and 44100
+               pd.stepSize = TimeRef(qreal(44100) / m_source->get_file_rate(), 
m_source->get_file_rate());
                pd.processRange = TimeRef(framesPerPeak, 
m_source->get_file_rate());
 
                for (uint i=0; i < readFrames; i++) {

Index: Sheet.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- Sheet.cpp   7 Feb 2009 19:06:38 -0000       1.21
+++ Sheet.cpp   12 Feb 2009 21:34:27 -0000      1.22
@@ -780,8 +780,8 @@
                hzoom = Peak::max_zoom_value();
        }
        
-       if (hzoom < 0.5) {
-               hzoom = 0.5;
+       if (hzoom < 1.0) {
+               hzoom = 1.0;
        }
        
        if (m_hzoom == hzoom) {