summaryrefslogtreecommitdiff
path: root/libs/ardour/session.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-12-10 03:25:32 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-12-10 03:25:32 +0000
commit61cade6d59118288e90a405e0f4fbc24d0108814 (patch)
treefe9083a4c005ac239bf5995c16252609dc547869 /libs/ardour/session.cc
parentf18bcf0cc835ab401d8e28dcc18c72795977752a (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 'libs/ardour/session.cc')
-rw-r--r--libs/ardour/session.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9c3b28049f..0bf161bb5d 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1648,7 +1648,7 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
*/
track->midi_diskstream()->non_realtime_input_change();
- track->set_route_group (route_group, 0);
+ route_group->add (track);
track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
//track->set_remote_control_id (control_id);
@@ -1819,7 +1819,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
channels_used += track->n_inputs ().n_audio();
- track->set_route_group (route_group, 0);
+ route_group->add (track);
track->audio_diskstream()->non_realtime_input_change();
@@ -1998,7 +1998,7 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou
channels_used += bus->n_inputs ().n_audio();
- bus->set_route_group (route_group, 0);
+ route_group->add (bus);
bus->set_remote_control_id (control_id);
++control_id;
@@ -2151,7 +2151,7 @@ Session::add_routes (RouteList& new_routes, bool save)
(*x)->mute_changed.connect (mem_fun (*this, &Session::route_mute_changed));
(*x)->output()->changed.connect (mem_fun (*this, &Session::set_worst_io_latencies_x));
(*x)->processors_changed.connect (mem_fun (*this, &Session::route_processors_changed));
- (*x)->route_group_changed.connect (hide (mem_fun (*this, &Session::route_group_changed)));
+ (*x)->route_group_changed.connect (mem_fun (*this, &Session::route_group_changed));
if ((*x)->is_master()) {
_master_out = (*x);