[Traverso-commit] traverso/src audiofileio/decode/AbstractAudioRe...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/09/10 19:22:52

Modified files:
        src/audiofileio/decode: AbstractAudioReader.h 
        src/core       : Utils.cpp 
        src/traverso/songcanvas: SongView.cpp TimeLineView.cpp 

Log message:
        fix wrong scalefactor to timeref_scalefactor scalar multiplication

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/AbstractAudioReader.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Utils.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.44&r2=1.45

Patches:
Index: audiofileio/decode/AbstractAudioReader.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/AbstractAudioReader.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- audiofileio/decode/AbstractAudioReader.h    10 Sep 2007 18:41:51 -0000      
1.9
+++ audiofileio/decode/AbstractAudioReader.h    10 Sep 2007 19:22:51 -0000      
1.10
@@ -56,9 +56,6 @@
                        destinationBufferSize = size;
                }
                
-               memset(destination[0], 0, destinationBufferSize * 
sizeof(audio_sample_t));
-
-               
                if (readBufferSize < (size*m_channels)) {
                        if (readBuffer) {
                                delete [] readBuffer;

Index: core/Utils.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Utils.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/Utils.cpp      10 Sep 2007 18:42:49 -0000      1.13
+++ core/Utils.cpp      10 Sep 2007 19:22:52 -0000      1.14
@@ -272,7 +272,7 @@
 
 QString timeref_to_text(const TimeRef & ref, int scalefactor)
 {
-       if (scalefactor >= 512*882) {
+       if (scalefactor >= 512*640) {
                return timeref_to_ms_2(ref);
        } else {
                return timeref_to_ms_3(ref);

Index: traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- traverso/songcanvas/SongView.cpp    10 Sep 2007 18:44:16 -0000      1.76
+++ traverso/songcanvas/SongView.cpp    10 Sep 2007 19:22:52 -0000      1.77
@@ -105,7 +105,7 @@
        
        
        scalefactor = Peak::zoomStep[m_song->get_hzoom()];
-       timeref_scalefactor = scalefactor * 882;
+       timeref_scalefactor = scalefactor * 640;
        
        song_mode_changed();
        
@@ -165,7 +165,7 @@
 void SongView::scale_factor_changed( )
 {
        scalefactor = Peak::zoomStep[m_song->get_hzoom()];
-       timeref_scalefactor = scalefactor * 882;
+       timeref_scalefactor = scalefactor * 640;
        m_tlvp->scale_factor_changed();
        layout_tracks();
 }

Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- traverso/songcanvas/TimeLineView.cpp        10 Sep 2007 18:44:16 -0000      
1.44
+++ traverso/songcanvas/TimeLineView.cpp        10 Sep 2007 19:22:52 -0000      
1.45
@@ -175,7 +175,7 @@
        }
        
        d->jogBypassPos = cpointer().x();
-       TimeRef newpos = (cpointer().scene_x() * d->scalefactor * 882);
+       TimeRef newpos = (cpointer().scene_x() * d->scalefactor * 640);
 
        if (m_marker->get_timeline()->get_song()->is_snap_on()) {
                SnapList* slist = 
m_marker->get_timeline()->get_song()->get_snap_list();
@@ -186,7 +186,7 @@
                newpos = 0;
        }
        
-       m_newWhen = newpos / 882;
+       m_newWhen = newpos / 640;
        d->view->set_position(int(m_newWhen / d->scalefactor));
        
        d->view->get_songview()->update_shuttle_factor();
@@ -225,26 +225,26 @@
 
        setAcceptsHoverEvents(true);
 
-       m_zooms[524288 * 882] = "20:00.000";
-       m_zooms[262144 * 882] = "10:00.000";
-       m_zooms[131072 * 882] = "5:00.000";
-       m_zooms[ 65536 * 882] = "2:30.000";
-       m_zooms[ 32768 * 882] = "1:00.000";
-       m_zooms[ 16384 * 882] = "0:30.000";
-       m_zooms[  8192 * 882] = "0:20.000";
-       m_zooms[  4096 * 882] = "0:10.000";
-       m_zooms[  2048 * 882] = "0:05.000";
-       m_zooms[  1024 * 882] = "0:02.000";
-       m_zooms[   512 * 882] = "0:01.000";
-       m_zooms[   256 * 882] = "0:00.800";
-       m_zooms[   128 * 882] = "0:00.400";
-       m_zooms[    64 * 882] = "0:00.200";
-       m_zooms[    32 * 882] = "0:00.100";
-       m_zooms[    16 * 882] = "0:00.050";
-       m_zooms[     8 * 882] = "0:00.020";
-       m_zooms[     4 * 882] = "0:00.010";
-       m_zooms[     2 * 882] = "0:00.005";
-       m_zooms[     1 * 882] = "0:00.002";
+       m_zooms[524288 * 640] = "20:00.000";
+       m_zooms[262144 * 640] = "10:00.000";
+       m_zooms[131072 * 640] = "5:00.000";
+       m_zooms[ 65536 * 640] = "2:30.000";
+       m_zooms[ 32768 * 640] = "1:00.000";
+       m_zooms[ 16384 * 640] = "0:30.000";
+       m_zooms[  8192 * 640] = "0:20.000";
+       m_zooms[  4096 * 640] = "0:10.000";
+       m_zooms[  2048 * 640] = "0:05.000";
+       m_zooms[  1024 * 640] = "0:02.000";
+       m_zooms[   512 * 640] = "0:01.000";
+       m_zooms[   256 * 640] = "0:00.800";
+       m_zooms[   128 * 640] = "0:00.400";
+       m_zooms[    64 * 640] = "0:00.200";
+       m_zooms[    32 * 640] = "0:00.100";
+       m_zooms[    16 * 640] = "0:00.050";
+       m_zooms[     8 * 640] = "0:00.020";
+       m_zooms[     4 * 640] = "0:00.010";
+       m_zooms[     2 * 640] = "0:00.005";
+       m_zooms[     1 * 640] = "0:00.002";
 }
 
 
@@ -406,7 +406,7 @@
        
update_softselected_marker(QPoint(cpointer().on_first_input_event_scene_x(), 
cpointer().on_first_input_event_scene_y()));
 
        if (m_blinkingMarker) {
-               
m_sv->get_song()->set_transport_pos(m_blinkingMarker->get_marker()->get_when() 
* 882);
+               
m_sv->get_song()->set_transport_pos(m_blinkingMarker->get_marker()->get_when() 
* 640);
                return 0;
        }