[Traverso-commit] traverso/src core/SnapList.cpp traverso/songcan...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/06 10:01:41

Modified files:
        src/core       : SnapList.cpp 
        src/traverso/songcanvas: TimeLineView.cpp 

Log message:
        * check if snaplist is dirty in nex/prev_snap_pos()
        * TODO nex/prev_snap_pos() doesn't take into account the snap range ?

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/SnapList.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.14&r2=1.15

Patches:
Index: core/SnapList.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/SnapList.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- core/SnapList.cpp   6 Apr 2007 09:29:03 -0000       1.12
+++ core/SnapList.cpp   6 Apr 2007 10:01:41 -0000       1.13
@@ -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.12 2007/04/06 09:29:03 r_sijrier Exp $
+$Id: SnapList.cpp,v 1.13 2007/04/06 10:01:41 r_sijrier Exp $
 */
 
 #include "SnapList.h"
@@ -33,7 +33,7 @@
 
 #include <Debugger.h>
 
-#define debugsnaplist
+//#define debugsnaplist
 
 #if defined (debugsnaplist)
 #define SLPRINT(args...) printf(args)
@@ -49,7 +49,7 @@
 {
        m_isDirty = true;
        m_rangeStart = 0;
-       m_rangeEnd = 900;
+       m_rangeEnd = 0;
        m_scalefactor = 1;
 }
 
@@ -266,6 +266,10 @@
 
 nframes_t SnapList::next_snap_pos(nframes_t pos)
 {
+       if (m_isDirty) {
+               update_snaplist();
+       }
+       
        int index = pos / m_scalefactor;
        
        nframes_t newpos = pos;
@@ -287,6 +291,10 @@
 
 nframes_t SnapList::prev_snap_pos(nframes_t pos)
 {
+       if (m_isDirty) {
+               update_snaplist();
+       }
+       
        if (! xposLut.size()) {
                return pos;
        }

Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- traverso/songcanvas/TimeLineView.cpp        6 Apr 2007 09:29:03 -0000       
1.14
+++ traverso/songcanvas/TimeLineView.cpp        6 Apr 2007 10:01:41 -0000       
1.15
@@ -98,7 +98,7 @@
 
 int DragMarker::begin_hold()
 {
-       m_origWhen = m_newWhen = m_mview->get_marker()->get_when();
+       m_origWhen = m_newWhen = m_marker->get_when();
        m_marker->set_snappable(false);
        
        return 1;