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

[Remon Sijrier]

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

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

Log message:
        Never use ViewItem objects in un/redo() functions, since they can be 
deleted due a remove action!!!!! 

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

Patches:
Index: TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- TimeLineView.cpp    29 Mar 2007 21:09:42 -0000      1.12
+++ TimeLineView.cpp    6 Apr 2007 07:43:30 -0000       1.13
@@ -62,6 +62,7 @@
        int jog();
 
 private :
+       Marker*         m_marker;
        MarkerView*     m_mview;
        nframes_t       m_origWhen;
        nframes_t       m_newWhen;
@@ -80,6 +81,7 @@
        : Command(mview->get_marker(), des)
 {
        m_mview = mview;
+       m_marker= m_mview->get_marker();
        m_scalefactor = scalefactor;
 }
 
@@ -90,14 +92,14 @@
 
 int DragMarker::finish_hold()
 {
-       m_mview->get_marker()->set_snappable(true);
+       m_marker->set_snappable(true);
        return do_action();
 }
 
 int DragMarker::begin_hold()
 {
        m_origWhen = m_newWhen = m_mview->get_marker()->get_when();
-       m_mview->get_marker()->set_snappable(false);
+       m_marker->set_snappable(false);
        
        return 1;
 }
@@ -105,13 +107,13 @@
 
 int DragMarker::do_action()
 {
-       m_mview->get_marker()->set_when(m_newWhen);
+       m_marker->set_when(m_newWhen);
        return 1;
 }
 
 int DragMarker::undo_action()
 {
-       m_mview->get_marker()->set_when(m_origWhen);
+       m_marker->set_when(m_origWhen);
        return 1;
 }