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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/05/05 17:13:13

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

Log message:
        fix signedness corectness, compile warnings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.h?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/SnapList.cpp?cvsroot=traverso&r1=1.14&r2=1.15

Patches:
Index: commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- commands/MoveClip.cpp       4 May 2007 18:09:28 -0000       1.37
+++ commands/MoveClip.cpp       5 May 2007 17:13:13 -0000       1.38
@@ -317,11 +317,13 @@
 
        // must be signed int because it can be negative
        int diff_f = (cpointer().x() - d->origXPos - scrollbardif) * 
d->sv->scalefactor;
-       long newTrackStartFrame = d->origTrackStartFrame + diff_f;
+       nframes_t newTrackStartFrame;
        nframes_t newTrackEndFrame = d->origTrackEndFrame + diff_f;
 
-       if (newTrackStartFrame < 0) {
+       if (diff_f < 0 && d->origTrackStartFrame < (nframes_t) -diff_f) {
                newTrackStartFrame = 0;
+       } else {
+               newTrackStartFrame = d->origTrackStartFrame + diff_f;
        }
 
        if (m_song->is_snap_on()) {
@@ -409,7 +411,7 @@
        Command::process_command(track->add_clip(m_clip, false));
 }
 
-void MoveClip::calculate_snap_diff(long& leftframe, nframes_t rightframe)
+void MoveClip::calculate_snap_diff(nframes_t& leftframe, nframes_t rightframe)
 {
        // "nframe_t" domain, but must be signed ints because they can become 
negative
        int snapStartDiff = 0;

Index: commands/MoveClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- commands/MoveClip.h 13 Apr 2007 12:07:00 -0000      1.18
+++ commands/MoveClip.h 5 May 2007 17:13:13 -0000       1.19
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: MoveClip.h,v 1.18 2007/04/13 12:07:00 r_sijrier Exp $
+    $Id: MoveClip.h,v 1.19 2007/05/05 17:13:13 benjie Exp $
 */
 
 #ifndef MOVECLIPACTION_H
@@ -82,7 +82,7 @@
        Data* d;
 
        void init_data(bool isCopy=false);
-       void calculate_snap_diff(long& leftframe, nframes_t rightframe);
+       void calculate_snap_diff(nframes_t& leftframe, nframes_t rightframe);
 
        
 public slots:

Index: core/SnapList.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/SnapList.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- core/SnapList.cpp   4 May 2007 21:28:06 -0000       1.14
+++ core/SnapList.cpp   5 May 2007 17:13:13 -0000       1.15
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: SnapList.cpp,v 1.14 2007/05/04 21:28:06 benjie Exp $
+$Id: SnapList.cpp,v 1.15 2007/05/05 17:13:13 benjie Exp $
 */
 
 #include "SnapList.h"
@@ -125,11 +125,11 @@
                xposBool.push_back(false);
        }
 
-       long lastVal = -1;
+       nframes_t lastVal = 0;
        long lastIndex = -1;
        // now modify the regions around snap points in the lookup table
        for (int i = 0; i < xposList.size(); i++) {
-               if (xposList.at(i) == lastVal) {
+               if (lastIndex > -1 && xposList.at(i) == lastVal) {
                        continue;  // check for duplicates and skip them
                }