From d65d4046fffcef5417aef15095a7a63543c68fff Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 1 Feb 2021 05:38:13 +0100
Subject: [PATCH] Use MonitorReturn for Monitor Bus

---
 libs/ardour/route.cc | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 044a8b5829..2aace64b66 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -72,6 +72,7 @@
 #include "ardour/midi_track.h"
 #include "ardour/monitor_control.h"
 #include "ardour/monitor_processor.h"
+#include "ardour/monitor_return.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
@@ -267,7 +268,7 @@ Route::init ()
 
 	if (is_monitor()) {
 		/* where we listen to tracks */
-		_intreturn.reset (new InternalReturn (_session));
+		_intreturn.reset (new MonitorReturn (_session));
 		_intreturn->activate ();
 
 		/* 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
 		} else if (prop->value() == "main-outs") {
 			_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") {
 			if (!_intreturn) {
-				_intreturn.reset (new InternalReturn (_session));
+				if (is_monitor ()) {
+					_intreturn.reset (new MonitorReturn (_session));
+				} else {
+					_intreturn.reset (new InternalReturn (_session));
+				}
 				must_configure = true;
 			}
 			_intreturn->set_state (**niter, version);