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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/20 09:45:07

Modified files:
        src/core       : Peak.cpp 
        src/traverso/songcanvas: AudioClipView.cpp 

Log message:
        * macro view mode goes one zoom step lower now

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.45&r2=1.46

Patches:
Index: core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- core/Peak.cpp       19 Apr 2007 19:58:39 -0000      1.17
+++ core/Peak.cpp       20 Apr 2007 09:45:07 -0000      1.18
@@ -269,7 +269,7 @@
                
                return pixelcount;
         
-       } else if ( (zoomLevel - 1) > MAX_ZOOM_USING_SOURCEFILE) {
+       } else if ( zoomLevel > MAX_ZOOM_USING_SOURCEFILE) {
                
                int offset = (startPos / zoomStep[zoomLevel]) * 2;
                

Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- traverso/songcanvas/AudioClipView.cpp       19 Apr 2007 19:58:39 -0000      
1.45
+++ traverso/songcanvas/AudioClipView.cpp       20 Apr 2007 09:45:07 -0000      
1.46
@@ -230,7 +230,7 @@
        }
        
        int channels = m_clip->get_channels();
-       bool microView = m_song->get_hzoom() > Peak::MAX_ZOOM_USING_SOURCEFILE 
? 0 : 1;
+       bool microView = m_song->get_hzoom() > (Peak::MAX_ZOOM_USING_SOURCEFILE 
- 1) ? 0 : 1;
        int peakdatacount = microView ? pixelcount : pixelcount * 2;
 
        int buffersize = microView ? sizeof(short) * peakdatacount : 
sizeof(unsigned char) * peakdatacount;