change region selection after a combine op

git-svn-id: svn://localhost/ardour2/branches/3.0@9580 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2011-05-25 00:40:32 +00:00
parent bf57411634
commit e5dc4e4ea2
5 changed files with 24 additions and 7 deletions

View File

@@ -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);

View File

@@ -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