Move panner bypass state up to the PannerShell so that it is preserved even when new Panners are dropped in (refixes #4185).

git-svn-id: svn://localhost/ardour2/branches/3.0@9877 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 27 deletions

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 05676c107d..a182f0b99c 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -32,7 +32,6 @@ using namespace ARDOUR;
 
 Panner::Panner (boost::shared_ptr<Pannable> p)
 	: _pannable (p)
-	, _bypassed (false)
 {
 }
 
@@ -41,35 +40,10 @@ Panner::~Panner ()
 	DEBUG_TRACE(PBD::DEBUG::Destruction, string_compose ("panner @ %1 destructor, pannable is %2\n", this, _pannable));
 }
 
-void
-Panner::set_bypassed (bool yn)
-{
-	if (yn != _bypassed) {
-		_bypassed = yn;
-		StateChanged ();
-	}
-}
-
-int
-Panner::set_state (const XMLNode& node, int version)
-{
-	const XMLProperty* prop;
-
-	if ((prop = node.property (X_("bypassed"))) != 0) {
-		set_bypassed (string_is_affirmative (prop->value()));
-	}
-
-	return 0;
-}
-
 XMLNode&
 Panner::get_state ()
 {
-	XMLNode* node = new XMLNode (X_("Panner"));
-
-	node->add_property (X_("bypassed"), (bypassed() ? "yes" : "no"));
-
-	return *node;
+	return *(new XMLNode (X_("Panner")));
 }
 
 void
@@ -140,3 +114,9 @@ Panner::value_as_string (boost::shared_ptr<AutomationControl> ac) const
 {
 	return _pannable->value_as_string (ac);
 }
+
+int
+Panner::set_state (XMLNode const &, int)
+{
+	return 0;
+}