X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fpanner_shell.cc;h=6c3ae0021cf1c80da7b118e445109ecb01c9a315;hb=e942c389a7aa3bc03adeb57dc0491ae6230fb213;hp=72c8fd57d1c3c1a2a4f7fde9d7ab4aacc26ff1a8;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index 72c8fd57d1..6c3ae0021c 100644
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -21,7 +21,6 @@
 
 #include <cmath>
 #include <cerrno>
-#include <fstream>
 #include <cstdlib>
 #include <string>
 #include <cstdio>
@@ -33,7 +32,6 @@
 #include <glibmm.h>
 
 #include "pbd/cartesian.h"
-#include "pbd/boost_debug.h"
 #include "pbd/convert.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
@@ -44,16 +42,18 @@
 
 #include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
+#include "ardour/boost_debug.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_manager.h"
 #include "ardour/panner_shell.h"
+#include "ardour/profile.h"
 #include "ardour/session.h"
 #include "ardour/speakers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "pbd/mathfix.h"
 
@@ -74,7 +74,7 @@ PannerShell::PannerShell (string name, Session& s, boost::shared_ptr<Pannable> p
 {
 	if (is_send) {
 		_pannable_internal.reset(new Pannable (s));
-		if (Config->get_link_send_and_route_panner()) {
+		if (Config->get_link_send_and_route_panner() && !ARDOUR::Profile->get_mixbus()) {
 			_panlinked = true;
 		} else {
 			_panlinked = false;
@@ -171,15 +171,17 @@ PannerShell::set_state (const XMLNode& node, int version)
 {
 	XMLNodeList nlist = node.children ();
 	XMLNodeConstIterator niter;
-	const XMLProperty *prop;
-	LocaleGuard lg (X_("C"));
+	XMLProperty const * prop;
+	LocaleGuard lg;
 
 	if ((prop = node.property (X_("bypassed"))) != 0) {
 		set_bypassed (string_is_affirmative (prop->value ()));
 	}
 
 	if ((prop = node.property (X_("linked-to-route"))) != 0) {
-		_panlinked = string_is_affirmative (prop->value ());
+		if (!ARDOUR::Profile->get_mixbus()) {
+			_panlinked = string_is_affirmative (prop->value ());
+		}
 	}
 
 	if ((prop = node.property (X_("user-panner"))) != 0) {