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 /libs/ardour/ardour/midi_region.h | |
| 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 'libs/ardour/ardour/midi_region.h')
| -rw-r--r-- | libs/ardour/ardour/midi_region.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 8f1edded21..b41f620e87 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -127,7 +127,7 @@ class LIBARDOUR_API MidiRegion : public Region MidiRegion (const SourceList&); MidiRegion (boost::shared_ptr<const MidiRegion>); - MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset, const int32_t sub_num = 0); + MidiRegion (boost::shared_ptr<const MidiRegion>, ARDOUR::MusicFrame offset); framecnt_t _read_at (const SourceList&, Evoral::EventSink<framepos_t>& dst, framepos_t position, @@ -146,6 +146,7 @@ class LIBARDOUR_API MidiRegion : public Region void recompute_at_end (); void set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num); + void set_position_music_internal (double qn); void set_length_internal (framecnt_t len, const int32_t sub_num); void set_start_internal (framecnt_t, const int32_t sub_num); void trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num); |