diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 21:21:16 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 21:21:16 +0000 |
| commit | c8a27ebdbf601c22b19ad8a7defeb98b784c0dcf (patch) | |
| tree | 716fad6a2fd84de55d13bbacdbc9d18cab78acb8 /gtk2_ardour/route_time_axis.cc | |
| parent | 99aa8c6338e47b41143f799fdcb35d1699548076 (diff) | |
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
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 119f1814d3..9f6a5e69ff 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -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); |