smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

rename join regions op as combine regions; save and restore nested playlists, sources, regions; add undo/redo for combine; fixup peakfile use/discovery

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9528 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-05-16 20:16:57 +00:00
parent 4b848856eb
commit 99aa8c6338
13 changed files with 167 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtk2_ardour/route_time_axis.cc
View file

@ -2486,7 +2486,7 @@ void add_region_to_list (RegionView* rv, Playlist::RegionList* l, uint32_t* max_
}
void
RouteTimeAxisView::join_regions ()
RouteTimeAxisView::combine_regions ()
{
assert (is_track());
@ -2495,11 +2495,16 @@ RouteTimeAxisView::join_regions ()
}
Playlist::RegionList selected_regions;
boost::shared_ptr<Playlist> playlist = track()->playlist();
uint32_t max_level = 0;
_view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions, &max_level));
uint32_t num_joined_regions = track()->playlist()->count_joined_regions();
string name = string_compose (_("%1 combine-%2 (%3)"), track()->playlist()->name(), num_joined_regions+1, max_level+1);
track()->playlist()->join (selected_regions, name);
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);
playlist->clear_changes ();
playlist->join (selected_regions, name);
_session->add_command (new StatefulDiffCommand (playlist));
}