Tempo ramps - fix copy/paste error.
authornick_m <mainsbridge@gmail.com>
Sun, 3 Apr 2016 19:11:49 +0000 (05:11 +1000)
committernick_m <mainsbridge@gmail.com>
Fri, 27 May 2016 13:38:14 +0000 (23:38 +1000)
gtk2_ardour/editor_drag.cc

index c7e96b27f7c95d059ac9ecf89141763e38a6b351..a7e4d22df151e1f7441127dbdbc7651b0094312d 100644 (file)
@@ -3362,8 +3362,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 
        framepos_t pf;
        Tempo const tp = _marker->tempo();
-
-       if (ArdourKeyboard::indicates_snap (event->button.state)) {
+       if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) {
                double new_bpm = _real_section->beats_per_minute() + ((last_pointer_y() - current_pointer_y()) / 5.0);
                _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type()));
                stringstream strs;
@@ -3383,7 +3382,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                        TempoMap& map (_editor->session()->tempo_map());
 
                        pf = adjusted_current_frame (event, false);
-                       if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::snap_modifier ())) {
+                       if (ArdourKeyboard::indicates_snap (event->button.state)) {
                                if (_editor->snap_mode() == Editing::SnapOff) {
                                        use_snap = true;
                                } else {