diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-10 03:25:32 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-10 03:25:32 +0000 |
commit | 61cade6d59118288e90a405e0f4fbc24d0108814 (patch) | |
tree | fe9083a4c005ac239bf5995c16252609dc547869 /gtk2_ardour/mixer_strip.cc | |
parent | f18bcf0cc835ab401d8e28dcc18c72795977752a (diff) |
drastic, deep and wide changes to make RouteGroup use boost::shared_ptr<Route> and boost::shared_ptr<RouteList> 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
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 8e67b4b526..22b39c1a29 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -447,7 +447,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) solo_changed (0); name_changed (); comment_changed (0); - route_group_changed (0); + route_group_changed (); connect_to_pan (); @@ -608,7 +608,7 @@ MixerStrip::set_width_enum (Width w, void* owner) update_input_display (); update_output_display (); - route_group_changed (0); + route_group_changed (); name_changed (); WidthChanged (); } @@ -1303,7 +1303,7 @@ MixerStrip::comment_changed (void *src) void MixerStrip::set_route_group (RouteGroup *rg) { - _route->set_route_group (rg, this); + rg->add (_route); } bool @@ -1330,9 +1330,9 @@ MixerStrip::select_route_group (GdkEventButton *ev) } void -MixerStrip::route_group_changed (void *ignored) +MixerStrip::route_group_changed () { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_group_changed), ignored)); + ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::route_group_changed)); RouteGroup *rg = _route->route_group(); |