diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/region.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 0a5f5e4ddc..09c31360ec 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -128,7 +128,7 @@ public: /* Editing operations */ - void add_region (boost::shared_ptr<Region>, framepos_t position, float times = 1, bool auto_partition = false); + void add_region (boost::shared_ptr<Region>, framepos_t position, float times = 1, bool auto_partition = false, const int32_t& sub_num = 0); void remove_region (boost::shared_ptr<Region>); void get_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&); void get_region_list_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&); @@ -161,7 +161,7 @@ public: boost::shared_ptr<Playlist> cut (std::list<AudioRange>&, bool result_is_hidden = true); boost::shared_ptr<Playlist> copy (std::list<AudioRange>&, bool result_is_hidden = true); - int paste (boost::shared_ptr<Playlist>, framepos_t position, float times); + int paste (boost::shared_ptr<Playlist>, framepos_t position, float times, const int32_t& sub_num); const RegionListProperty& region_list_property () const { return regions; } boost::shared_ptr<RegionList> region_list(); @@ -362,7 +362,7 @@ public: virtual XMLNode& state (bool); - bool add_region_internal (boost::shared_ptr<Region>, framepos_t position); + bool add_region_internal (boost::shared_ptr<Region>, framepos_t position, const int32_t& sub_num = 0); int remove_region_internal (boost::shared_ptr<Region>); void copy_regions (RegionList&) const; diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index ec4f559a87..7f41cb6e5a 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -171,10 +171,12 @@ class LIBARDOUR_API Region Trimmable::CanTrim can_trim () const; PositionLockStyle position_lock_style () const { return _position_lock_style; } - double beat () const { return _beat; } void set_position_lock_style (PositionLockStyle ps); void recompute_position_from_lock_style (const int32_t& sub_num); + double beat () const { return _beat; } + void set_beat (double beat) { _beat = beat; } + void suspend_property_changes (); bool covers (framepos_t frame) const { |