make boost shared_ptr debugging a little easier to turn on/off

[ardour.git] / libs / ardour / panner_shell.cc

diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index 72c8fd57d1c3c1a2a4f7fde9d7ab4aacc26ff1a8..afc34c358a29410d5d30ede10c1a3b86841ff0af 100644 (file)
--- 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,12 +42,14 @@
 
 #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"
 
@@ -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) {