diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-01-05 15:52:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-01-05 15:52:27 +0000 |
| commit | 12a3e9b879270e1411d0827c58f55d9becba326f (patch) | |
| tree | fe2e1255196cc026808f43db2de2e7dea3870e9b /libs | |
| parent | 06387abfec773556ec9dad8ca7363e714e3e4ce4 (diff) | |
Remove direct busses so that all busses have internal returns.
git-svn-id: svn://localhost/ardour2/branches/3.0@8447 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/route_group.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index a056c7a2f2..d7aef0960e 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -415,7 +415,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi int input_channels, int output_channels, TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1 ); - RouteList new_audio_route (bool aux, int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many); + RouteList new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many); std::list<boost::shared_ptr<MidiTrack> > new_midi_track ( TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1 diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index a9e942ef3a..1fdccbd393 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -407,7 +407,7 @@ RouteGroup::make_subgroup (bool aux, Placement placement) try { /* use master bus etc. to determine default nouts */ - rl = _session.new_audio_route (aux, nin, 2, 0, 1); + rl = _session.new_audio_route (nin, 2, 0, 1); } catch (...) { return; } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 3b69fd8279..72163155a5 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1792,7 +1792,7 @@ Session::set_remote_control_ids () /** Caller must not hold process lock */ RouteList -Session::new_audio_route (bool aux, int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many) +Session::new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many) { char bus_name[32]; uint32_t bus_id = 0; @@ -1850,9 +1850,7 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou bus->set_remote_control_id (control_id); ++control_id; - if (aux) { - bus->add_internal_return (); - } + bus->add_internal_return (); ret.push_back (bus); } |