[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/commands MoveClip.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/commands MoveClip.cpp |
Date: |
Wed, 27 Jun 2007 13:19:49 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/06/27 13:19:49
Modified files:
src/commands : MoveClip.cpp
Log message:
copy clip redo didn't work when targetTrack == origTrack, should work
now (please test)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.46&r2=1.47
Patches:
Index: MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- MoveClip.cpp 7 Jun 2007 13:40:58 -0000 1.46
+++ MoveClip.cpp 27 Jun 2007 13:19:49 -0000 1.47
@@ -204,6 +204,11 @@
m_clip->set_left_edge(m_oldOppositeEdge);
}
+ if (m_actionType == "copy") {
+ Command::process_command(m_targetTrack->remove_clip(m_clip,
false));
+ Command::process_command(m_originTrack->remove_clip(m_clip,
false));
+ }
+
if (m_originTrack == m_targetTrack && m_posDiff == 0 &&
! (m_actionType == "copy" || m_actionType == "move_to_start"
|| m_actionType == "move_to_end") ) {
return -1;
@@ -225,7 +230,12 @@
return 1;
}
+ if (m_actionType == "copy") {
+ Command::process_command(m_targetTrack->add_clip(m_clip,
false));
+ m_clip->set_track_start_frame(m_originalTrackFirstFrame +
m_posDiff);
+ } 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);