change session construction so that the the monitor bus config is derived (once) from the master bus config

git-svn-id: svn://localhost/ardour2/branches/3.0@6779 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 9 insertions, 38 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b216acae29..716a6820b8 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2273,7 +2273,6 @@ int
 ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name)
 {
 
-	uint32_t cchns;
 	uint32_t mchns;
 	AutoConnectOption iconnect;
 	AutoConnectOption oconnect;
@@ -2282,7 +2281,6 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 
 	if (Profile->get_sae()) {
 
-		cchns = 0;
 		mchns = 2;
 		iconnect = AutoConnectPhysical;
 		oconnect = AutoConnectMaster;
@@ -2293,12 +2291,6 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 
 		/* get settings from advanced section of NSD */
 
-		if (_startup->create_control_bus()) {
-			cchns = (uint32_t) _startup->control_channel_count();
-		} else {
-			cchns = 0;
-		}
-
 		if (_startup->create_master_bus()) {
 			mchns = (uint32_t) _startup->master_channel_count();
 		} else {
@@ -2329,7 +2321,7 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 
 	if (build_session (session_path,
 			   session_name,
-			   cchns,
+                           _startup->create_control_bus(),
 			   mchns,
 			   iconnect,
 			   oconnect,
@@ -2642,7 +2634,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 
 int
 ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name,
-			  uint32_t control_channels,
+                          bool with_monitor,
 			  uint32_t master_channels,
 			  AutoConnectOption input_connect,
 			  AutoConnectOption output_connect,
@@ -2671,7 +2663,7 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
 
 	try {
 		new_session = new Session (*engine, path, snap_name, input_connect, output_connect,
-					   control_channels, master_channels, nphysin, nphysout, initial_length);
+					   with_monitor, master_channels, nphysin, nphysout, initial_length);
 	}
 
 	catch (...) {
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index a851e03981..0ae904678d 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -125,7 +125,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	int load_session (const Glib::ustring& path, const Glib::ustring& snapshot, Glib::ustring mix_template = Glib::ustring());
 	bool session_loaded;
 	int build_session (const Glib::ustring& path, const Glib::ustring& snapshot,
-			   uint32_t ctl_chns,
+			   bool with_monitor,
 			   uint32_t master_chns,
 			   ARDOUR::AutoConnectOption input_connect,
 			   ARDOUR::AutoConnectOption output_connect,
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index f6ec9e0490..456cb4922e 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -812,11 +812,9 @@ ArdourStartup::setup_more_options_page ()
 
 	_output_limit_count.set_adjustment (_output_limit_count_adj);
 	_input_limit_count.set_adjustment (_input_limit_count_adj);
-	_control_bus_channel_count.set_adjustment (_control_bus_channel_count_adj);
 	_master_bus_channel_count.set_adjustment (_master_bus_channel_count_adj);
 
 	chan_count_label_1.set_text (_("channels"));
-	chan_count_label_2.set_text (_("channels"));
 	chan_count_label_3.set_text (_("channels"));
 	chan_count_label_4.set_text (_("channels"));
 
@@ -824,10 +822,6 @@ ArdourStartup::setup_more_options_page ()
 	chan_count_label_1.set_padding(0,0);
 	chan_count_label_1.set_line_wrap(false);
 
-	chan_count_label_2.set_alignment(0,0.5);
-	chan_count_label_2.set_padding(0,0);
-	chan_count_label_2.set_line_wrap(false);
-
 	chan_count_label_3.set_alignment(0,0.5);
 	chan_count_label_3.set_padding(0,0);
 	chan_count_label_3.set_line_wrap(false);
@@ -847,13 +841,6 @@ ArdourStartup::setup_more_options_page ()
 	_create_control_bus.set_active(false);
 	_create_control_bus.set_border_width(0);
 
-	_control_bus_channel_count.set_flags(Gtk::CAN_FOCUS);
-	_control_bus_channel_count.set_update_policy(Gtk::UPDATE_ALWAYS);
-	_control_bus_channel_count.set_numeric(true);
-	_control_bus_channel_count.set_digits(0);
-	_control_bus_channel_count.set_wrap(false);
-	_control_bus_channel_count.set_sensitive(false);
-
 	_master_bus_channel_count.set_flags(Gtk::CAN_FOCUS);
 	_master_bus_channel_count.set_update_policy(Gtk::UPDATE_ALWAYS);
 	_master_bus_channel_count.set_numeric(true);
@@ -909,8 +896,6 @@ ArdourStartup::setup_more_options_page ()
 	bus_table.attach (_master_bus_channel_count, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	bus_table.attach (chan_count_label_1, 2, 3, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 6, 0);
 	bus_table.attach (_create_control_bus, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	bus_table.attach (_control_bus_channel_count, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	bus_table.attach (chan_count_label_2, 2, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 6, 0);
 
 	input_port_limit_hbox.pack_start(_limit_input_ports, Gtk::PACK_SHRINK, 6);
 	input_port_limit_hbox.pack_start(_input_limit_count, Gtk::PACK_SHRINK, 0);
@@ -1037,12 +1022,6 @@ ArdourStartup::create_control_bus() const
 	return _create_control_bus.get_active();
 }
 
-int
-ArdourStartup::control_channel_count() const
-{
-	return _control_bus_channel_count.get_value_as_int();
-}
-
 bool
 ArdourStartup::connect_inputs() const
 {
@@ -1130,13 +1109,16 @@ ArdourStartup::limit_outputs_clicked ()
 void
 ArdourStartup::master_bus_button_clicked ()
 {
-	_master_bus_channel_count.set_sensitive(_create_master_bus.get_active());
+        bool yn = _create_master_bus.get_active();
+
+	_master_bus_channel_count.set_sensitive(yn);
+        _create_control_bus.set_sensitive (yn);
 }
 
 void
 ArdourStartup::monitor_bus_button_clicked ()
 {
-	_control_bus_channel_count.set_sensitive(_create_control_bus.get_active());
+        /* relax */
 }
 
 void
diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index f0146e2a5e..01fdd853f2 100644
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -45,7 +45,6 @@ class ArdourStartup : public Gtk::Assistant {
 	int master_channel_count() const;
 
 	bool create_control_bus() const;
-	int control_channel_count() const;
 
 	bool connect_inputs() const;
 	bool limit_inputs_used_for_connection() const;
@@ -180,7 +179,6 @@ class ArdourStartup : public Gtk::Assistant {
 	Gtk::VBox more_options_vbox;
 
 	Gtk::Label chan_count_label_1;
-	Gtk::Label chan_count_label_2;
 	Gtk::Label chan_count_label_3;
 	Gtk::Label chan_count_label_4;
 	Gtk::Table advanced_table;
@@ -211,7 +209,6 @@ class ArdourStartup : public Gtk::Assistant {
 	Gtk::SpinButton _master_bus_channel_count;
 
 	Gtk::CheckButton _create_control_bus;
-	Gtk::SpinButton _control_bus_channel_count;
 
 	Gtk::CheckButton _connect_inputs;
 	Gtk::CheckButton _limit_input_ports;