diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-01-27 00:41:17 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-02-04 22:57:36 +1100 |
| commit | 59daffea1d78cb55b35fe19c135cc4ab472bd01d (patch) | |
| tree | 45e514f2e4f5a1935e360fd4fa3e2475ec217006 /gtk2_ardour/audio_region_view.cc | |
| parent | a21a414615505269bf770ad2358482e698e841af (diff) | |
rework snap
snap now fills in a struct (MusicFrame) which contins a snapped frame
along with a music divisor.
this gives useful information wrt magnetic snap which may or may not
have rounded to an exact musical position.
region position may now be set musically (using quarter notes for now).
this patch fixes several problems in the current code:
- dragging a list of music-locked regions now maintains correct
musical offsets within the list.
- splitting regions using magnetic snap works correctly (#7192)
- cut drag should now work correctly with magnetic snap.
- musical length of split midi regions is no longer frame based.
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 177d0d92e0..ed5665ddb1 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1347,11 +1347,10 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, b /* don't create points that can't be seen */ update_envelope_visibility (); - framepos_t rpos = region ()->position (); - framepos_t fx = trackview.editor().pixel_to_sample (mx) + rpos; - trackview.editor ().snap_to_with_modifier (fx, ev); - fx -= rpos; + MusicFrame snap_pos (trackview.editor().pixel_to_sample (mx) + rpos, 0); + trackview.editor ().snap_to_with_modifier (snap_pos, ev); + framepos_t fx = snap_pos.frame - rpos; if (fx > _region->length()) { return; |