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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/02/18 08:09:54

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

Log message:
        * snap_to_prev/next() reworked

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.h?cvsroot=traverso&r1=1.31&r2=1.32

Patches:
Index: MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- MoveClip.cpp        16 Feb 2008 21:54:44 -0000      1.71
+++ MoveClip.cpp        18 Feb 2008 08:09:54 -0000      1.72
@@ -311,31 +311,23 @@
 void MoveClip::next_snap_pos(bool autorepeat)
 {
        Q_UNUSED(autorepeat);
-       ie().bypass_jog_until_mouse_movements_exceeded_manhattenlength();
-       
-/*     TimeRef trackStartLocation = 
m_sheet->get_snap_list()->next_snap_pos(m_clip->get_track_start_location());
-       TimeRef trackEndLocation = 
m_sheet->get_snap_list()->next_snap_pos(m_clip->get_track_end_location());
-       qint64 startdiff = (trackStartLocation - 
m_clip->get_track_start_location()).universal_frame();
-       qint64 enddiff = (trackEndLocation - 
m_clip->get_track_end_location()).universal_frame();
-       qint64 diff = (abs(startdiff) < abs(enddiff)) ? startdiff : enddiff;
-       trackStartLocation = m_clip->get_track_start_location() + diff;
-       m_posDiff = trackStartLocation - m_trackStartLocation;
-       m_clip->set_track_start_location(trackStartLocation);*/
+       
do_prev_next_snap(m_sheet->get_snap_list()->next_snap_pos(m_group.get_track_start_location()),
+                         
m_sheet->get_snap_list()->next_snap_pos(m_group.get_track_end_location()));
 }
 
 void MoveClip::prev_snap_pos(bool autorepeat)
 {
        Q_UNUSED(autorepeat);
-       ie().bypass_jog_until_mouse_movements_exceeded_manhattenlength();
+       
do_prev_next_snap(m_sheet->get_snap_list()->prev_snap_pos(m_group.get_track_start_location()),
+                       
m_sheet->get_snap_list()->prev_snap_pos(m_group.get_track_end_location()));
+}
        
-/*     TimeRef trackStartLocation = 
m_sheet->get_snap_list()->prev_snap_pos(m_clip->get_track_start_location());
-       TimeRef trackEndLocation = 
m_sheet->get_snap_list()->prev_snap_pos(m_clip->get_track_end_location());
-       qint64 startdiff = (trackStartLocation - 
m_clip->get_track_start_location()).universal_frame();
-       qint64 enddiff = (trackEndLocation - 
m_clip->get_track_end_location()).universal_frame();
-       qint64 diff = (abs(startdiff) < abs(enddiff)) ? startdiff : enddiff;
-       trackStartLocation = m_clip->get_track_start_location() + diff;
+void MoveClip::do_prev_next_snap(TimeRef trackStartLocation, TimeRef 
trackEndLocation)
+{
+       ie().bypass_jog_until_mouse_movements_exceeded_manhattenlength();
+       trackStartLocation -= 
m_sheet->get_snap_list()->calculate_snap_diff(trackStartLocation, 
trackEndLocation);
        m_posDiff = trackStartLocation - m_trackStartLocation;
-       m_clip->set_track_start_location(trackStartLocation);*/
+       m_group.move_to(m_group.get_track_index(), m_trackStartLocation + 
m_posDiff);
 }
 
 void MoveClip::move_to_start(bool autorepeat)

Index: MoveClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- MoveClip.h  16 Feb 2008 20:04:42 -0000      1.31
+++ MoveClip.h  18 Feb 2008 08:09:54 -0000      1.32
@@ -84,7 +84,7 @@
        
        Data* d;
 
-       void init_data();
+       void do_prev_next_snap(TimeRef trackStartLocation, TimeRef 
trackEndLocation);
        
 public slots:
        void next_snap_pos(bool autorepeat);