summaryrefslogtreecommitdiff
path: root/libs/ardour/session_state.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-08-15 20:38:24 +0200
committerRobin Gareus <robin@gareus.org>2017-08-16 00:51:20 +0200
commit1d8c7ef37a1f020d1448208cb6c3b9f667ee1602 (patch)
treefe45fb4ff2b4e3f1596f0711c4e5da14252c03fe /libs/ardour/session_state.cc
parentb3dc75fed3180d7265f099e0a715a6f0d678d8db (diff)
Clean up BusProfile:
* requested_physical_in/out was unused * input/output Autoconnect just overrides Preference/Config (can be done by a template script) * master_out_channels is kept for compatibility (allow to create new empty session)
Diffstat (limited to 'libs/ardour/session_state.cc')
-rw-r--r--libs/ardour/session_state.cc19
1 files changed, 0 insertions, 19 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 5e1525dbed..b0b8a46a4b 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -657,7 +657,6 @@ Session::create (const string& session_template, BusProfile* bus_profile)
/* set up Master Out and Monitor Out if necessary */
if (bus_profile) {
-
RouteList rl;
ChanCount count(DataType::AUDIO, bus_profile->master_out_channels);
@@ -678,29 +677,11 @@ Session::create (const string& session_template, BusProfile* bus_profile)
rl.push_back (r);
- } else {
- /* prohibit auto-connect to master, because there isn't one */
- bus_profile->output_ac = AutoConnectOption (bus_profile->output_ac & ~AutoConnectMaster);
}
if (!rl.empty()) {
add_routes (rl, false, false, false, PresentationInfo::max_order);
}
-
- // Waves Tracks: Skip this. Always use autoconnection for Tracks
- if (!ARDOUR::Profile->get_trx()) {
-
- /* this allows the user to override settings with an environment variable.
- */
-
- if (no_auto_connect()) {
- bus_profile->input_ac = AutoConnectOption (0);
- bus_profile->output_ac = AutoConnectOption (0);
- }
-
- Config->set_input_auto_connect (bus_profile->input_ac);
- Config->set_output_auto_connect (bus_profile->output_ac);
- }
}
if (Config->get_use_monitor_bus() && bus_profile) {