summaryrefslogtreecommitdiff
path: root/libs/ardour/session.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-03-22 03:22:28 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-03-22 03:22:28 +0000
commit7689d72875e77e15c87f6c49e8a509cd37925435 (patch)
tree1738a38887a4274870c3a826a61dfbe48279b50b /libs/ardour/session.cc
parent814f2fbd8f88299110a7b2bbc49d85d1e121f1e1 (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/ardour/session.cc')
-rw-r--r--libs/ardour/session.cc5
1 files changed, 1 insertions, 4 deletions
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);