Fix stripable order for new strips & master-order

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

diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index 72c8fd57d1c3c1a2a4f7fde9d7ab4aacc26ff1a8..f49c6b2c30846e2525d59d0aef5a663771bdf2da 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,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;
@@ -155,9 +155,9 @@ PannerShell::get_state ()
 {
        XMLNode* node = new XMLNode ("PannerShell");
 
-       node->add_property (X_("bypassed"), _bypassed ? X_("yes") : X_("no"));
-       node->add_property (X_("user-panner"), _user_selected_panner_uri);
-       node->add_property (X_("linked-to-route"), _panlinked ? X_("yes") : X_("no"));
+       node->set_property (X_("bypassed"), _bypassed);
+       node->set_property (X_("user-panner"), _user_selected_panner_uri);
+       node->set_property (X_("linked-to-route"), _panlinked);
 
        if (_panner && _is_send) {
                node->add_child_nocopy (_panner->get_state ());
@@ -171,29 +171,29 @@ PannerShell::set_state (const XMLNode& node, int version)
 {
        XMLNodeList nlist = node.children ();
        XMLNodeConstIterator niter;
-       const XMLProperty *prop;
-       LocaleGuard lg (X_("C"));
+       bool yn;
+       std::string str;
+       LocaleGuard lg;
 
-       if ((prop = node.property (X_("bypassed"))) != 0) {
-               set_bypassed (string_is_affirmative (prop->value ()));
+       if (node.get_property (X_("bypassed"), yn)) {
+               set_bypassed (yn);
        }
 
-       if ((prop = node.property (X_("linked-to-route"))) != 0) {
-               _panlinked = string_is_affirmative (prop->value ());
+       if (node.get_property (X_("linked-to-route"), yn)) {
+               if (!ARDOUR::Profile->get_mixbus()) {
+                       _panlinked = yn;
+               }
        }
 
-       if ((prop = node.property (X_("user-panner"))) != 0) {
-               _user_selected_panner_uri = prop->value ();
-       }
+       node.get_property (X_("user-panner"), _user_selected_panner_uri);
 
        _panner.reset ();
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
                if ((*niter)->name() == X_("Panner")) {
-
-                       if ((prop = (*niter)->property (X_("uri")))) {
-                               PannerInfo* p = PannerManager::instance().get_by_uri(prop->value());
+                       if ((*niter)->get_property (X_("uri"), str)) {
+                               PannerInfo* p = PannerManager::instance().get_by_uri(str);
                                if (p) {
                                        _panner.reset (p->descriptor.factory (
                                                                _is_send ? _pannable_internal : _pannable_route, _session.get_speakers ()));
@@ -215,13 +215,13 @@ PannerShell::set_state (const XMLNode& node, int version)
                        }
 
                        else /* backwards compatibility */
-                       if ((prop = (*niter)->property (X_("type")))) {
+                       if ((*niter)->get_property (X_("type"), str)) {
 
                                list<PannerInfo*>::iterator p;
                                PannerManager& pm (PannerManager::instance());
 
                                for (p = pm.panner_info.begin(); p != pm.panner_info.end(); ++p) {
-                                       if (prop->value() == (*p)->descriptor.name) {
+                                       if (str == (*p)->descriptor.name) {
 
                                                /* note that we assume that all the stream panners
                                                   are of the same type. pretty good
@@ -253,7 +253,7 @@ PannerShell::set_state (const XMLNode& node, int version)
 
                                if (p == pm.panner_info.end()) {
                                        error << string_compose (_("Unknown panner plugin \"%1\" found in pan state - ignored"),
-                                                                prop->value())
+                                                                str)
                                              << endmsg;
                                }