ardour/livetrax
13
0
Fork 0
Code

Mixbus backports -- part one of many

Browse Source 
Changes that are not explicitly #ifdef'ed should go to ardour-git.
This commit is contained in:
Robin Gareus 2019-09-24 22:10:02 +02:00
parent 0eebc8b894
commit 1f4b409d7e
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/ardour_ui_session.cc
View File

@ -49,6 +49,7 @@
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/filename_extensions.h" #include "ardour/filename_extensions.h"
#include "ardour/profile.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_utils.h" #include "ardour/session_utils.h"
#include "ardour/session_state_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) { if (nsm) {
bus_profile.master_out_channels = 2; bus_profile.master_out_channels = 2;
} else if ( Profile->get_mixbus()) {
bus_profile.master_out_channels = 2;
} else { } else {
/* get settings from advanced section of NSD */ /* get settings from advanced section of NSD */
bus_profile.master_out_channels = (uint32_t) sd.master_channel_count(); bus_profile.master_out_channels = (uint32_t) sd.master_channel_count();

2
gtk2_ardour/ardour_ui_startup.cc
View File

@ -601,7 +601,7 @@ ARDOUR_UI::starting ()
/* go get a session */ /* 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)) { if (get_session_parameters (false, new_session_required, ARDOUR_COMMAND_LINE::load_template)) {
std::cerr << "Cannot get session parameters."<< std::endl; std::cerr << "Cannot get session parameters."<< std::endl;