smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Use MonitorReturn for Monitor Bus

Browse source
This commit is contained in:
Robin Gareus 2021-02-01 05:38:13 +01:00
parent a0fd462830
commit d65d4046ff
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libs/ardour/route.cc
View file

@ -72,6 +72,7 @@
#include "ardour/midi_track.h" #include "ardour/midi_track.h"
#include "ardour/monitor_control.h" #include "ardour/monitor_control.h"
#include "ardour/monitor_processor.h" #include "ardour/monitor_processor.h"
#include "ardour/monitor_return.h"
#include "ardour/pannable.h" #include "ardour/pannable.h"
#include "ardour/panner.h" #include "ardour/panner.h"
#include "ardour/panner_shell.h" #include "ardour/panner_shell.h"
@ -267,7 +268,7 @@ Route::init ()
if (is_monitor()) { if (is_monitor()) {
/* where we listen to tracks */ /* where we listen to tracks */
_intreturn.reset (new InternalReturn (_session)); _intreturn.reset (new MonitorReturn (_session));
_intreturn->activate (); _intreturn->activate ();
/* the thing that provides proper control over a control/monitor/listen bus /* the thing that provides proper control over a control/monitor/listen bus
@ -3079,9 +3080,19 @@ Route::set_processor_state (const XMLNode& node, int version)
// skip -- internal // skip -- internal
} else if (prop->value() == "main-outs") { } else if (prop->value() == "main-outs") {
_main_outs->set_state (**niter, version); _main_outs->set_state (**niter, version);
} else if (prop->value() == "monreturn") {
if (!_intreturn) {
_intreturn.reset (new MonitorReturn (_session));
must_configure = true;
}
_intreturn->set_state (**niter, version);
} else if (prop->value() == "intreturn") { } else if (prop->value() == "intreturn") {
if (!_intreturn) { if (!_intreturn) {
_intreturn.reset (new InternalReturn (_session)); if (is_monitor ()) {
_intreturn.reset (new MonitorReturn (_session));
} else {
_intreturn.reset (new InternalReturn (_session));
}
must_configure = true; must_configure = true;
} }
_intreturn->set_state (**niter, version); _intreturn->set_state (**niter, version);