diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-25 00:40:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-25 00:40:32 +0000 |
| commit | e5dc4e4ea2cd4f2a91f77464980db52fd4df6b86 (patch) | |
| tree | 829ac5a39327ca1f167c6bcb1b90dd9238e82f65 /libs/ardour | |
| parent | bf574116346fdc3804d37c0e7ee424608d7ee38e (diff) | |
change region selection after a combine op
git-svn-id: svn://localhost/ardour2/branches/3.0@9580 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 2 | ||||
| -rw-r--r-- | libs/ardour/playlist.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 5d3d5d2504..5eaf10273d 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -139,7 +139,7 @@ public: void partition (framepos_t start, framepos_t end, bool cut = false); void duplicate (boost::shared_ptr<Region>, framepos_t position, float times); void nudge_after (framepos_t start, framecnt_t distance, bool forwards); - void combine (const RegionList&, const std::string&); + boost::shared_ptr<Region> combine (const RegionList&, const std::string&); void uncombine (boost::shared_ptr<Region>); void shuffle (boost::shared_ptr<Region>, int dir); diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 38a231b2d1..4157ab4459 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -3152,7 +3152,7 @@ Playlist::find_next_top_layer_position (framepos_t t) const return max_framepos; } -void +boost::shared_ptr<Region> Playlist::combine (const RegionList& r, const std::string& name) { PropertyList plist; @@ -3237,6 +3237,8 @@ Playlist::combine (const RegionList& r, const std::string& name) _combine_ops++; thaw (); + + return compound_region; } void |