track combine ops per-playlist to avoid name collisions for compound regions

git-svn-id: svn://localhost/ardour2/branches/3.0@9529 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-05-16 21:21:16 +00:00
parent 99aa8c6338
commit c8a27ebdbf
4 changed files with 13 additions and 5 deletions

View file

@ -2500,9 +2500,7 @@ RouteTimeAxisView::combine_regions ()
_view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions, &max_level));
uint32_t num_joined_regions = playlist->count_joined_regions();
string name = string_compose (_("%1 compound-%2 (%3)"), playlist->name(), num_joined_regions+1, max_level+1);
string name = string_compose (_("%1 compound-%2 (%3)"), playlist->name(), playlist->combine_ops()+1, max_level+1);
playlist->clear_changes ();
playlist->join (selected_regions, name);