diff options
| author | Robin Gareus <robin@gareus.org> | 2019-09-24 22:10:02 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-09-24 22:10:20 +0200 |
| commit | 1f4b409d7ec0093ee9874656c96ef8f01d027583 (patch) | |
| tree | be49ab10980a7ae8fc3f794dafe43467dfc3a178 /gtk2_ardour | |
| parent | 0eebc8b8948edf4ec5c038119784767d5b229a52 (diff) | |
Mixbus backports -- part one of many
Changes that are not explicitly #ifdef'ed should go to ardour-git.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui_session.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_startup.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_session.cc b/gtk2_ardour/ardour_ui_session.cc index 03862c5477..9bc6a898ac 100644 --- a/gtk2_ardour/ardour_ui_session.cc +++ b/gtk2_ardour/ardour_ui_session.cc @@ -49,6 +49,7 @@ #include "ardour/audioengine.h" #include "ardour/filename_extensions.h" +#include "ardour/profile.h" #include "ardour/session.h" #include "ardour/session_utils.h" #include "ardour/session_state_utils.h" @@ -109,6 +110,8 @@ ARDOUR_UI::build_session_from_dialog (SessionDialog& sd, const std::string& sess if (nsm) { bus_profile.master_out_channels = 2; + } else if ( Profile->get_mixbus()) { + 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(); diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc index 62be3e5aa4..a6e4bc6dc9 100644 --- a/gtk2_ardour/ardour_ui_startup.cc +++ b/gtk2_ardour/ardour_ui_startup.cc @@ -601,7 +601,7 @@ ARDOUR_UI::starting () /* go get a session */ - const bool new_session_required = (ARDOUR_COMMAND_LINE::new_session || brand_new_user); + const bool new_session_required = (ARDOUR_COMMAND_LINE::new_session || (!ARDOUR::Profile->get_mixbus() && brand_new_user)); if (get_session_parameters (false, new_session_required, ARDOUR_COMMAND_LINE::load_template)) { std::cerr << "Cannot get session parameters."<< std::endl; |