From 61cade6d59118288e90a405e0f4fbc24d0108814 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 10 Dec 2009 03:25:32 +0000 Subject: drastic, deep and wide changes to make RouteGroup use boost::shared_ptr and boost::shared_ptr to better fit into emerging framework for "RT operations" ; torben's changes to MTC slaving code (sorry for bundling) git-svn-id: svn://localhost/ardour2/branches/3.0@6334 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_route_groups.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gtk2_ardour/editor_route_groups.cc') diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 79049e02bc..bb094e2cc0 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -271,7 +271,7 @@ EditorRouteGroups::run_new_group_dialog (const RouteList& rl) case Gtk::RESPONSE_ACCEPT: _session->add_route_group (g); for (RouteList::const_iterator i = rl.begin(); i != rl.end(); ++i) { - (*i)->set_route_group (g, this); + g->add (*i); } break; default: @@ -673,7 +673,7 @@ EditorRouteGroups::connect_to_session (Session* s) } struct CollectSorter { - bool operator () (Route* a, Route* b) { + bool operator () (boost::shared_ptr a, boost::shared_ptr b) { return a->order_key (N_ ("editor")) < b->order_key (N_ ("editor")); } }; @@ -684,16 +684,16 @@ struct CollectSorter { void EditorRouteGroups::collect (RouteGroup* g) { - list routes = g->route_list (); - routes.sort (CollectSorter ()); - int const N = routes.size (); + boost::shared_ptr routes = g->route_list (); + routes->sort (CollectSorter ()); + int const N = routes->size (); - list::iterator i = routes.begin (); + RouteList::iterator i = routes->begin (); Editor::TrackViewList::const_iterator j = _editor->get_track_views().begin(); int diff = 0; int coll = -1; - while (i != routes.end() && j != _editor->get_track_views().end()) { + while (i != routes->end() && j != _editor->get_track_views().end()) { RouteTimeAxisView* rtv = dynamic_cast (*j); if (rtv) { @@ -701,7 +701,7 @@ EditorRouteGroups::collect (RouteGroup* g) boost::shared_ptr r = rtv->route (); int const k = r->order_key (N_ ("editor")); - if (*i == r.get()) { + if (*i == r) { if (coll == -1) { coll = k; -- cgit v1.2.3