[Traverso-commit] traverso/src/commands MoveClip.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/07 13:40:58

Modified files:
        src/commands   : MoveClip.cpp 

Log message:
        use Song::move_clip() in undo_action() as well.... Minor cleanup, 
please test!!! 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.45&r2=1.46

Patches:
Index: MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- MoveClip.cpp        4 Jun 2007 15:51:03 -0000       1.45
+++ MoveClip.cpp        7 Jun 2007 13:40:58 -0000       1.46
@@ -225,11 +225,7 @@
                return 1;
        }
 
-       if (!m_targetTrack) {
-               Command::process_command(m_originTrack->remove_clip(m_clip, 
false));
-       } else {
                m_song->move_clip(m_originTrack, m_targetTrack, m_clip, 
m_originalTrackFirstFrame + m_posDiff);
-       }
        
        if (m_actionType == "anchored_left_edge_move") {
                m_clip->set_right_edge(m_oldOppositeEdge);
@@ -245,13 +241,11 @@
 int MoveClip::undo_action()
 {
        PENTER;
-       if (m_targetTrack) {
-               Command::process_command(m_targetTrack->remove_clip(m_clip, 
false));
-       }
        
-       if (m_actionType != "copy") {
-               m_clip->set_track_start_frame(m_originalTrackFirstFrame);
-               Command::process_command(m_originTrack->add_clip(m_clip, 
false));
+       if (m_actionType == "copy") {
+               Command::process_command(m_targetTrack->remove_clip(m_clip, 
false));
+       } else {
+               m_song->move_clip(m_targetTrack, m_originTrack, m_clip, 
m_originalTrackFirstFrame);
        }
 
        if (m_actionType == "anchored_left_edge_move") {