diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-06-14 03:21:52 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-07-10 02:18:36 +1000 |
| commit | 2d5238d87581bc0ff9dcaaa8aad9e255b5d9c370 (patch) | |
| tree | 0b6d271f2b8a6284004d28f613b5cc9afdda53ca /libs/ardour/ardour/region.h | |
| parent | 0d050de94e3ae5a1a0dc36114df1995b042f3b80 (diff) | |
Make some musical operations on music-locked regions operate in beats.
- use exact beats to determine frame position.
- see comments in tempo.cc for more.
- this hasn't been done for split yet, but dragging and
trimming are supported.
Diffstat (limited to 'libs/ardour/ardour/region.h')
| -rw-r--r-- | libs/ardour/ardour/region.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 776a8a7966..e0dd159ce5 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -207,7 +207,7 @@ class LIBARDOUR_API Region void set_length (framecnt_t); void set_start (framepos_t); - void set_position (framepos_t); + void set_position (framepos_t, int32_t sub_num = 0); void set_initial_position (framepos_t); void special_set_position (framepos_t); virtual void update_after_tempo_map_change (bool send_change = true); @@ -216,15 +216,15 @@ class LIBARDOUR_API Region bool at_natural_position () const; void move_to_natural_position (); - void move_start (frameoffset_t distance); - void trim_front (framepos_t new_position); - void trim_end (framepos_t new_position); - void trim_to (framepos_t position, framecnt_t length); + void move_start (frameoffset_t distance, const int32_t& sub_num = 0); + void trim_front (framepos_t new_position, const int32_t& sub_num = 0); + void trim_end (framepos_t new_position, const int32_t& sub_num = 0); + void trim_to (framepos_t position, framecnt_t length, const int32_t& sub_num = 0); virtual void fade_range (framepos_t, framepos_t) {} - void cut_front (framepos_t new_position); - void cut_end (framepos_t new_position); + void cut_front (framepos_t new_position, const int32_t& sub_num = 0); + void cut_end (framepos_t new_position, const int32_t& sub_num = 0); void set_layer (layer_t l); /* ONLY Playlist can call this */ void raise (); @@ -358,7 +358,7 @@ class LIBARDOUR_API Region void post_set (const PBD::PropertyChange&); 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); + virtual void set_start_internal (framecnt_t, const int32_t& sub_num = 0); bool verify_start_and_length (framepos_t, framecnt_t&); void first_edit (); @@ -396,9 +396,9 @@ class LIBARDOUR_API Region private: void mid_thaw (const PBD::PropertyChange&); - 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); + virtual void trim_to_internal (framepos_t position, framecnt_t length, const int32_t& sub_num); + void modify_front (framepos_t new_position, bool reset_fade, const int32_t& sub_num); + void modify_end (framepos_t new_position, bool reset_fade, const int32_t& sub_num); void maybe_uncopy (); |