diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/midi_region.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/region.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index b952c90f82..b4557ed1dd 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -101,7 +101,7 @@ class LIBARDOUR_API MidiRegion : public Region boost::shared_ptr<const MidiModel> model() const; void fix_negative_start (); - + Evoral::Beats start_beats () {return _start_beats.val(); } protected: virtual bool can_trim_start_before_source_start () const { @@ -134,6 +134,7 @@ class LIBARDOUR_API MidiRegion : public Region void set_position_internal (framepos_t pos, bool allow_bbt_recompute); void set_length_internal (framecnt_t len); void set_start_internal (framecnt_t); + void trim_to_internal (framepos_t position, framecnt_t length); void update_length_beats (); void model_changed (); diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 29f4244dff..3a8a694c49 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -171,7 +171,7 @@ class LIBARDOUR_API Region Trimmable::CanTrim can_trim () const; PositionLockStyle position_lock_style () const { return _position_lock_style; } - + double beat () { return _beat; } void set_position_lock_style (PositionLockStyle ps); void recompute_position_from_lock_style (); @@ -358,6 +358,8 @@ class LIBARDOUR_API Region virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute); virtual void set_length_internal (framecnt_t); virtual void set_start_internal (framecnt_t); + bool verify_start_and_length (framepos_t, framecnt_t&); + void first_edit (); DataType _type; @@ -393,15 +395,13 @@ class LIBARDOUR_API Region private: void mid_thaw (const PBD::PropertyChange&); - void trim_to_internal (framepos_t position, framecnt_t length); + virtual void trim_to_internal (framepos_t position, framecnt_t length); void modify_front (framepos_t new_position, bool reset_fade); void modify_end (framepos_t new_position, bool reset_fade); void maybe_uncopy (); - void first_edit (); bool verify_start (framepos_t); - bool verify_start_and_length (framepos_t, framecnt_t&); bool verify_start_mutable (framepos_t&_start); bool verify_length (framecnt_t&); |