[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 10:54:09

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

Log message:
        * return -1 in begin_hold() if our group is empty!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClipGroup.h?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.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- commands/MoveClip.cpp       14 Feb 2008 10:32:22 -0000      1.67
+++ commands/MoveClip.cpp       14 Feb 2008 10:54:09 -0000      1.68
@@ -149,6 +149,10 @@
 
 int MoveClip::begin_hold()
 {
+       if (!m_group.get_size()) {
+               return -1;
+       }
+       
        m_trackStartLocation = m_group.get_track_start_location();
        
        if (m_actionType == COPY) {

Index: core/AudioClipGroup.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClipGroup.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- core/AudioClipGroup.h       14 Feb 2008 10:32:22 -0000      1.4
+++ core/AudioClipGroup.h       14 Feb 2008 10:54:09 -0000      1.5
@@ -43,6 +43,8 @@
        void add_all_clips_to_tracks();
        void remove_all_clips_from_tracks();
        
+       int get_size() {return m_clips.size();}
+       
        TimeRef get_track_start_location() const {return m_trackStartLocation;}
        TimeRef get_track_end_location() const {return m_trackEndLocation;}
        TimeRef get_length() const {return m_trackEndLocation - 
m_trackStartLocation;}