diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-27 16:29:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-27 16:29:01 +0000 |
| commit | 33c61757fc8352fdb1280bca28b54d1adee183ff (patch) | |
| tree | 3079597365e70769acd6befe3fa95dc8e9f87439 /gtk2_ardour/route_time_axis.cc | |
| parent | fc3be1d42c6400896a85edbc83bda38242cec30a (diff) | |
promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead.
git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 54b6ae5023..13f169b96e 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -2416,7 +2416,7 @@ RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, } static -void add_region_to_list (RegionView* rv, Playlist::RegionList* l) +void add_region_to_list (RegionView* rv, RegionList* l) { l->push_back (rv->region()); } @@ -2435,7 +2435,7 @@ RouteTimeAxisView::combine_regions () return 0; } - Playlist::RegionList selected_regions; + RegionList selected_regions; boost::shared_ptr<Playlist> playlist = track()->playlist(); _view->foreach_selected_regionview (sigc::bind (sigc::ptr_fun (add_region_to_list), &selected_regions)); @@ -2466,7 +2466,7 @@ RouteTimeAxisView::uncombine_regions () return; } - Playlist::RegionList selected_regions; + RegionList selected_regions; boost::shared_ptr<Playlist> playlist = track()->playlist(); /* have to grab selected regions first because the uncombine is going @@ -2477,7 +2477,7 @@ RouteTimeAxisView::uncombine_regions () playlist->clear_changes (); - for (Playlist::RegionList::iterator i = selected_regions.begin(); i != selected_regions.end(); ++i) { + for (RegionList::iterator i = selected_regions.begin(); i != selected_regions.end(); ++i) { playlist->uncombine (*i); } |