More tempo marker cross-dragging fixes.

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index c82a007060e31b56cc0f3996df6ece8e356396d8..93fd8a33c08a5826d4bdb11298a857ffc2fbb8da 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3340,29 +3340,19 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 
                const framepos_t pf = adjusted_current_frame (event);
 
-               if (!_editor->snap_musical()) {
-
-                       if (was_music) {
-                               _real_section->set_position_lock_style (AudioTime);
-                       }
-
-                       map.gui_move_tempo (_real_section, pf);
-
-                       if (was_music) {
-                               _real_section->set_position_lock_style (MusicTime);
-                       }
-
-               } else {
-
-                       if (!was_music) {
-                               _real_section->set_position_lock_style (MusicTime);
-                       }
+               /* cop-out : we really should set the musical position of music-locked tempo sections here, which generally works well.
+                  The problem is that when the mouse pointer's motion causes the location of the beat to change in a more-or-less
+                  chaotic way when cross-dragging tempo sections (the beat the pointer is now above could have changed without any pointer motion).
+                  Until there is a way to deal with this, just pretend the tempo section is audio-locked.
+               */
+               if (was_music) {
+                       _real_section->set_position_lock_style (AudioTime);
+               }
 
-                       map.gui_move_tempo (_real_section, pf);
+               map.gui_move_tempo (_real_section, pf);
 
-                       if (!was_music) {
-                               _real_section->set_position_lock_style (AudioTime);
-                       }
+               if (was_music) {
+                       _real_section->set_position_lock_style (MusicTime);
                }
 
                show_verbose_cursor_time (_real_section->frame());