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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/02/14 18:05:59

Modified files:
        src/commands   : MoveClip.cpp 
        src/core       : AudioClipGroup.cpp 

Log message:
        invalidate the action if the group didn't move

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClipGroup.cpp?cvsroot=traverso&r1=1.4&r2=1.5

Patches:
Index: commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- commands/MoveClip.cpp       14 Feb 2008 10:54:09 -0000      1.68
+++ commands/MoveClip.cpp       14 Feb 2008 18:05:59 -0000      1.69
@@ -197,10 +197,10 @@
                m_group.remove_all_clips_from_tracks();
        }
        
-/*     if (m_originTrack == m_targetTrack &&  m_posDiff == qint64(0) && 
+       if (m_origTrackIndex == m_newTrackIndex &&  m_posDiff == TimeRef() && 
                   ! (m_actionType == COPY || m_actionType == MOVE_TO_START || 
m_actionType == MOVE_TO_END) ) {
                return -1;
-       }*/
+       }
        
        return 1;
 }
@@ -254,7 +254,7 @@
        }
        
        TrackView* trackView = 
d->sv->get_trackview_under(cpointer().scene_pos());
-       if (trackView) {
+       if (trackView && !(m_actionType == FOLD_SHEET)) {
                m_newTrackIndex = trackView->get_track()->get_sort_index();
        }
 

Index: core/AudioClipGroup.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClipGroup.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- core/AudioClipGroup.cpp     14 Feb 2008 10:32:22 -0000      1.4
+++ core/AudioClipGroup.cpp     14 Feb 2008 18:05:59 -0000      1.5
@@ -62,7 +62,6 @@
        foreach(AudioClip* clip, m_clips) {
                
                if (clip->get_track()->get_sort_index() != trackIndex) {
-                       Sheet* s = clip->get_sheet();
                        Track* track = 
clip->get_sheet()->get_track_for_index(trackIndex);
                        if (track) {
                                
Command::process_command(clip->get_track()->remove_clip(clip, false, true));