diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-01-31 04:15:21 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-02-04 22:57:36 +1100 |
| commit | 04c484089c5f1ff064b111ce3e4f1e2ff7e7ec83 (patch) | |
| tree | efb94145b86ba76386fa524b9e5ef6205750e636 /gtk2_ardour/editor_drag.cc | |
| parent | d38dc863800642ae57711a8e446a0fca5d5a3d32 (diff) | |
non-primary music-locked regions follow tempo changes while dragging.
- the contents still don't update but position is much
more wysiwyg.
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index ac761dcb6c..7624546347 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -928,8 +928,13 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) } /* Work out the change in x */ + TempoMap& tmap = _editor->session()->tempo_map(); MusicFrame pending_region_position (0, 0); double const x_delta = compute_x_delta (event, &pending_region_position); + + double const last_pos_qn = tmap.exact_qn_at_frame (_last_position.frame, _last_position.division); + double const qn_delta = tmap.exact_qn_at_frame (pending_region_position.frame, pending_region_position.division) - last_pos_qn; + _last_position = pending_region_position; /* calculate hidden tracks in current y-axis delta */ @@ -1173,7 +1178,14 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) } /* Now move the region view */ - rv->move (x_delta, y_delta); + if (rv->region()->position_lock_style() == MusicTime) { + double const last_qn = tmap.quarter_note_at_frame (rv->get_position()); + framepos_t const x_pos_music = tmap.frame_at_quarter_note (last_qn + qn_delta); + + rv->set_position (x_pos_music, 0); + } else { + rv->move (x_delta, y_delta); + } } /* foreach region */ |