[Traverso-commit] traverso/src/traverso/songcanvas TimeLineView.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/04 15:27:15

Modified files:
        src/traverso/songcanvas: TimeLineView.cpp 

Log message:
        bypass jog after using additional keyfact to move marker left/right by 
one pixel

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.39&r2=1.40

Patches:
Index: TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- TimeLineView.cpp    31 May 2007 06:20:13 -0000      1.39
+++ TimeLineView.cpp    4 Jun 2007 15:27:15 -0000       1.40
@@ -76,6 +76,7 @@
        nframes_t       m_origWhen;
        nframes_t       m_newWhen;
        double          m_scalefactor;
+       bool            m_bypassjog;
 
 public slots:
        void move_left(bool autorepeat);
@@ -92,6 +93,7 @@
        m_view = mview;
        m_marker= m_view->get_marker();
        m_scalefactor = scalefactor;
+       m_bypassjog = false;
 }
 
 int DragMarker::prepare_actions()
@@ -136,6 +138,7 @@
 
 void DragMarker::move_left(bool )
 {
+       m_bypassjog = true;
        // Move 1 pixel to the left
        long newpos = m_newWhen - (uint) ( 1 * m_scalefactor);
        if (newpos < 0) {
@@ -147,6 +150,7 @@
 
 void DragMarker::move_right(bool )
 {
+       m_bypassjog = true;
        // Move 1 pixel to the right
        m_newWhen = m_newWhen + (uint) ( 1 * m_scalefactor);
        do_action();
@@ -154,6 +158,10 @@
 
 int DragMarker::jog()
 {
+       if (m_bypassjog) {
+               return 0;
+       }
+       
        long newpos = (uint) (cpointer().scene_x() * m_scalefactor);
 
        if (m_marker->get_timeline()->get_song()->is_snap_on()) {