diff options
author | Robin Gareus <robin@gareus.org> | 2017-03-01 13:04:39 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-03-01 13:04:58 +0100 |
commit | 6e5cfb665f428b8bf78715de785030975414c39d (patch) | |
tree | b468f9b753b1b7e5060a6d92c6cdfc99b66c3f20 /libs | |
parent | 88a22d40b5befe71d8c51939b3bb3aeea754642a (diff) |
Fix audition with monitor-section.
When a monitor-section is added, the auditioner automatically connects to
its input. However on session-reload, the connection is explicit
(by saved port-name) and Auditioner::needs_monitor() was not set.
Session::process_audition() didn't run the monitor-route. Silence.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/auditioner.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index b190165c72..eec65f07f6 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -139,7 +139,6 @@ Auditioner::connect () if (left.empty() || left == "default") { if (_session.monitor_out() && _session.monitor_out()->input()->audio (0)) { left = _session.monitor_out()->input()->audio (0)->name(); - via_monitor = true; } else { if (outputs.size() > 0) { left = outputs[0]; @@ -150,7 +149,6 @@ Auditioner::connect () if (right.empty() || right == "default") { if (_session.monitor_out() && _session.monitor_out()->input()->audio (1)) { right = _session.monitor_out()->input()->audio (1)->name(); - via_monitor = true; } else { if (outputs.size() > 1) { right = outputs[1]; @@ -200,6 +198,10 @@ Auditioner::connect () } + if (_session.monitor_out () && _output->connected_to (_session.monitor_out ()->input())) { + via_monitor = true; + } + return 0; } |