diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-22 03:22:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-22 03:22:28 +0000 |
| commit | 7689d72875e77e15c87f6c49e8a509cd37925435 (patch) | |
| tree | 1738a38887a4274870c3a826a61dfbe48279b50b /libs | |
| parent | 814f2fbd8f88299110a7b2bbc49d85d1e121f1e1 (diff) | |
put the issue of using a monitor section into ~/.config/ardour.rc, not the session file. probably not totally right yet. provide startup dialog choice page to let first time users make the decision when first trying ardour (needs rewording)
git-svn-id: svn://localhost/ardour2/branches/3.0@6780 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 1 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 5 |
3 files changed, 2 insertions, 5 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 823fb4e7f2..31f4b96620 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -79,6 +79,7 @@ CONFIG_VARIABLE (bool, mute_affects_control_outs, "mute-affects-control-outs", t CONFIG_VARIABLE (bool, mute_affects_main_outs, "mute-affects-main-outs", true) CONFIG_VARIABLE (MonitorModel, monitoring_model, "monitoring-model", ExternalMonitoring) CONFIG_VARIABLE (ListenPosition, listen_position, "listen-position", AfterFaderListen) +CONFIG_VARIABLE (bool, use_monitor_bus, "use-monitor-bus", false) CONFIG_VARIABLE (bool, solo_control_is_listen_control, "solo-control-is-listen-control", false) CONFIG_VARIABLE (bool, solo_latched, "solo-latched", true) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index cb62decafc..57332babf3 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -142,7 +142,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi std::string snapshot_name, AutoConnectOption input_auto_connect, AutoConnectOption output_auto_connect, - bool with_monitor, uint32_t master_out_channels, uint32_t n_physical_in, uint32_t n_physical_out, diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 20e88756ea..b2f6f7412f 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -206,7 +206,6 @@ Session::Session (AudioEngine &eng, string snapshot_name, AutoConnectOption input_ac, AutoConnectOption output_ac, - bool with_monitor, uint32_t master_out_channels, uint32_t requested_physical_in, uint32_t requested_physical_out, @@ -295,7 +294,7 @@ Session::Session (AudioEngine &eng, output_ac = AutoConnectOption (output_ac & ~AutoConnectMaster); } - if (with_monitor) { + if (Config->get_use_monitor_bus()) { ChanCount count(DataType::AUDIO, master_out_channels); Route* rt = new Route (*this, _("monitor"), Route::ControlOut, DataType::AUDIO); boost_debug_shared_ptr_mark_interesting (rt, "Route"); @@ -814,8 +813,6 @@ Session::hookup_io (bool new_session) } else { - cerr << "Connecting route " << (*x)->name() << " to control outs\n"; - (*x)->listen_via (_control_out, (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader), false, false); |