summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-07-19 23:12:42 +0000
committerCarl Hetherington <carl@carlh.net>2011-07-19 23:12:42 +0000
commitc3bea354f85ca90ba26818b6ce14bc5abd8cf1ba (patch)
tree9c91acf00b9fa4324f5453c21dca0f917ea48788 /gtk2_ardour
parent85e8f7762ec2075c303c451814cbf782b91f8287 (diff)
Set up advanced session options from the RCConfiguration so that the RCConfiguration values don't get ignored on startup (#4205).
git-svn-id: svn://localhost/ardour2/branches/3.0@9908 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/startup.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index e1366c3acd..c7ee065b32 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -1066,7 +1066,7 @@ ArdourStartup::setup_more_options_page ()
_connect_inputs.set_flags(Gtk::CAN_FOCUS);
_connect_inputs.set_relief(Gtk::RELIEF_NORMAL);
_connect_inputs.set_mode(true);
- _connect_inputs.set_active(true);
+ _connect_inputs.set_active(Config->get_input_auto_connect() != ManualConnect);
_connect_inputs.set_border_width(0);
_limit_input_ports.set_label (_("Use only"));
@@ -1126,7 +1126,7 @@ ArdourStartup::setup_more_options_page ()
_connect_outputs.set_flags(Gtk::CAN_FOCUS);
_connect_outputs.set_relief(Gtk::RELIEF_NORMAL);
_connect_outputs.set_mode(true);
- _connect_outputs.set_active(true);
+ _connect_outputs.set_active(Config->get_output_auto_connect() != ManualConnect);
_connect_outputs.set_border_width(0);
_limit_output_ports.set_label (_("Use only"));
_limit_output_ports.set_flags(Gtk::CAN_FOCUS);
@@ -1148,7 +1148,7 @@ ArdourStartup::setup_more_options_page ()
_connect_outputs_to_master.set_flags(Gtk::CAN_FOCUS);
_connect_outputs_to_master.set_relief(Gtk::RELIEF_NORMAL);
_connect_outputs_to_master.set_mode(true);
- _connect_outputs_to_master.set_active(false);
+ _connect_outputs_to_master.set_active(Config->get_output_auto_connect() == AutoConnectMaster);
_connect_outputs_to_master.set_border_width(0);
_connect_outputs_to_master.set_group (connect_outputs_group);
@@ -1158,7 +1158,7 @@ ArdourStartup::setup_more_options_page ()
_connect_outputs_to_physical.set_flags(Gtk::CAN_FOCUS);
_connect_outputs_to_physical.set_relief(Gtk::RELIEF_NORMAL);
_connect_outputs_to_physical.set_mode(true);
- _connect_outputs_to_physical.set_active(false);
+ _connect_outputs_to_physical.set_active(Config->get_output_auto_connect() == AutoConnectPhysical);
_connect_outputs_to_physical.set_border_width(0);
output_conn_vbox.pack_start(_connect_outputs, Gtk::PACK_SHRINK, 0);