[Traverso-commit] traverso/src/traverso/songcanvas SongView.cpp T...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/06 10:16:13

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

Log message:
        * added autoscroll for Marker, work and playcursor. Perhaps not always 
handy ?

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.15&r2=1.16

Patches:
Index: SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- SongView.cpp        5 Apr 2007 13:15:07 -0000       1.37
+++ SongView.cpp        6 Apr 2007 10:16:13 -0000       1.38
@@ -103,6 +103,7 @@
        }
        m_cursor->set_active(m_song->is_transporting());
        m_song->set_transport_pos( (nframes_t) (x * m_sv->scalefactor));
+       m_sv->start_shuttle(true);
        return -1;
 }
 
@@ -110,6 +111,7 @@
 {
        m_cursor->show();
        m_cursor->set_active(false);
+       m_sv->start_shuttle(true, true);
        return 1;
 }
 
@@ -123,6 +125,9 @@
        if (m_resync && m_song->is_transporting()) {
                m_song->set_transport_pos( (nframes_t) (x * m_sv->scalefactor));
        }
+       
+       m_sv->update_shuttle_factor();
+       
        return 1;
 }
 
@@ -166,6 +171,7 @@
                m_playCursor->setPos(x, 0);
                m_song->set_transport_pos( (nframes_t) (x * m_sv->scalefactor));
        }
+       m_sv->start_shuttle(false);
        return -1;
 }
 
@@ -175,6 +181,7 @@
                m_playCursor->disable_follow();
        }
        m_song->get_work_snap()->set_snappable(false);
+       m_sv->start_shuttle(true, true);
        return 1;
 }
 
@@ -195,6 +202,7 @@
 
        m_song->set_work_at(newFrame);
 
+       m_sv->update_shuttle_factor();
        return 1;
 }
 

Index: TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- TimeLineView.cpp    6 Apr 2007 10:01:41 -0000       1.15
+++ TimeLineView.cpp    6 Apr 2007 10:16:13 -0000       1.16
@@ -93,6 +93,7 @@
 int DragMarker::finish_hold()
 {
        m_marker->set_snappable(true);
+       m_mview->get_songview()->start_shuttle(false);
        return do_action();
 }
 
@@ -100,6 +101,7 @@
 {
        m_origWhen = m_newWhen = m_marker->get_when();
        m_marker->set_snappable(false);
+       m_mview->get_songview()->start_shuttle(true, true);
        
        return 1;
 }
@@ -141,6 +143,7 @@
        }
 
        m_mview->set_position(m_newWhen / m_scalefactor);
+       m_mview->get_songview()->update_shuttle_factor();
        return 1;
 }