diff options
| author | Robin Gareus <robin@gareus.org> | 2017-08-16 01:13:00 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-08-16 01:17:35 +0200 |
| commit | bd40b9132cbac2d2b79ba0ef480bd41d837f8f71 (patch) | |
| tree | 7e420e0eb68d52019c774b04adccd5f3b9ae239d /gtk2_ardour/ardour_ui.cc | |
| parent | 26c88b2a3ea2dba06197c8f353dfa3af25b342e0 (diff) | |
Revert ongoing SessionDialog changes for 5.11 release.5.11
To be reverted again after the release. This temporarily reverts
26c88b2, c67d1d4, 5e41293, 8b7df13, ff61435, 1039894, 8717c0d
and GUI parts of 47d86cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 90c9b9cf29..3425ab1bb1 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3287,12 +3287,18 @@ ARDOUR_UI::build_session_from_dialog (SessionDialog& sd, const std::string& sess if (nsm) { bus_profile.master_out_channels = 2; } else { + /* get settings from advanced section of NSD */ - bus_profile.master_out_channels = (uint32_t) sd.master_channel_count(); + + if (sd.create_master_bus()) { + bus_profile.master_out_channels = (uint32_t) sd.master_channel_count(); + } else { + bus_profile.master_out_channels = 0; + } + } - // NULL profile: no master, no monitor - if (build_session (session_path, session_name, bus_profile.master_out_channels > 0 ? &bus_profile : NULL)) { + if (build_session (session_path, session_name, &bus_profile)) { return -1; } |