summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-05-28 03:16:06 +1000
committernick_m <mainsbridge@gmail.com>2016-05-28 03:16:06 +1000
commit062e17a5421656febfafd08057fe6bc77804d89b (patch)
tree99f579edcd0f52caf2531935966a5a0f1339fd79 /gtk2_ardour
parent1c51cbcc823ab49ad87e04d5c2a7c15da1d56924 (diff)
Don't change snap settings when dragging audio-locked meters.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_drag.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 251242f057..ca07c5ffbb 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3184,9 +3184,12 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
, beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style());
}
- /* only snap to bars */
- _editor->set_snap_to (SnapToBar);
- _editor->set_snap_mode (SnapNormal); }
+ /* only snap to bars. leave snap mode alone for audio locked meters.*/
+ if (_real_section->position_lock_style() != AudioTime) {
+ _editor->set_snap_to (SnapToBar);
+ _editor->set_snap_mode (SnapNormal);
+ }
+ }
framepos_t pf = adjusted_current_frame (event);