ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Force snap when dragging meters.

Browse Source
This commit is contained in:
nick_m 2016-05-28 02:57:53 +10:00
parent 9506fd884d
commit 1c51cbcc82
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor_drag.cc
View File

@ -3118,6 +3118,7 @@ MeterMarkerDrag::MeterMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c)
: Drag (e, i)
, _copy (c)
, _old_snap_type (e->snap_type())
, _old_snap_mode (e->snap_mode())
, before_state (0)
{
DEBUG_TRACE (DEBUG::Drags, "New MeterMarkerDrag\n");
@ -3185,7 +3186,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
}
/* only snap to bars */
_editor->set_snap_to (SnapToBar);
}
_editor->set_snap_mode (SnapNormal); }
framepos_t pf = adjusted_current_frame (event);
@ -3214,6 +3215,7 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
/* reinstate old snap setting */
_editor->set_snap_to (_old_snap_type);
_editor->set_snap_mode (_old_snap_mode);
TempoMap& map (_editor->session()->tempo_map());
@ -3233,6 +3235,8 @@ MeterMarkerDrag::aborted (bool moved)
if (moved) {
/* reinstate old snap setting */
_editor->set_snap_to (_old_snap_type);
_editor->set_snap_mode (_old_snap_mode);
_editor->session()->tempo_map().set_state (*before_state, Stateful::current_state_version);
// delete the dummy marker we used for visual representation while moving.
// a new visual marker will show up automatically.

1
gtk2_ardour/editor_drag.h
View File

@ -710,6 +710,7 @@ private:
bool _copy;
Editing::SnapType _old_snap_type;
Editing::SnapMode _old_snap_mode;
XMLNode* before_state;
};