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

6 files changed, 4 insertions, 49 deletions

diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc
index 6c002c1591..19b8dadd6d 100644
--- a/libs/panners/1in2out/panner_1in2out.cc
+++ b/libs/panners/1in2out/panner_1in2out.cc
@@ -323,26 +323,13 @@ Panner1in2out::factory (boost::shared_ptr<Pannable> p, boost::shared_ptr<Speaker
 }
 
 XMLNode&
-Panner1in2out::get_state (void)
-{
-	return state (true);
-}
-
-XMLNode&
-Panner1in2out::state (bool /*full_state*/)
+Panner1in2out::get_state ()
 {
 	XMLNode& root (Panner::get_state ());
 	root.add_property (X_("type"), _descriptor.name);
 	return root;
 }
 
-int
-Panner1in2out::set_state (const XMLNode& node, int version)
-{
-	LocaleGuard lg (X_("POSIX"));
-	Panner::set_state (node, version);
-	return 0;
-}
 
 std::set<Evoral::Parameter> 
 Panner1in2out::what_can_be_automated() const
diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h
index c36e3e87c7..bd1b1a9c12 100644
--- a/libs/panners/1in2out/panner_1in2out.h
+++ b/libs/panners/1in2out/panner_1in2out.h
@@ -56,9 +56,7 @@ class Panner1in2out : public Panner
         std::string describe_parameter (Evoral::Parameter);
         std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
 
-	XMLNode& state (bool full_state); 
-	XMLNode& get_state (void); 
-	int      set_state (const XMLNode&, int version);
+	XMLNode& get_state ();
 
   protected:
 	float left;
diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc
index 0c5184efe6..1ac3974c49 100644
--- a/libs/panners/2in2out/panner_2in2out.cc
+++ b/libs/panners/2in2out/panner_2in2out.cc
@@ -435,27 +435,13 @@ Panner2in2out::factory (boost::shared_ptr<Pannable> p, boost::shared_ptr<Speaker
 }
 
 XMLNode&
-Panner2in2out::get_state (void)
-{
-	return state (true);
-}
-
-XMLNode&
-Panner2in2out::state (bool /*full_state*/)
+Panner2in2out::get_state ()
 {
 	XMLNode& root (Panner::get_state ());
 	root.add_property (X_("type"), _descriptor.name);
 	return root;
 }
 
-int
-Panner2in2out::set_state (const XMLNode& node, int version)
-{
-	LocaleGuard lg (X_("POSIX"));
-	Panner::set_state (node, version);
-	return 0;
-}
-
 std::set<Evoral::Parameter> 
 Panner2in2out::what_can_be_automated() const
 {
diff --git a/libs/panners/2in2out/panner_2in2out.h b/libs/panners/2in2out/panner_2in2out.h
index b9b9a73dfb..48f441fbd0 100644
--- a/libs/panners/2in2out/panner_2in2out.h
+++ b/libs/panners/2in2out/panner_2in2out.h
@@ -62,9 +62,7 @@ class Panner2in2out : public Panner
         std::string describe_parameter (Evoral::Parameter);
         std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
 
-	XMLNode& state (bool full_state); 
-	XMLNode& get_state (void); 
-	int      set_state (const XMLNode&, int version);
+	XMLNode& get_state ();
 
         void update ();
 
diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index 2f047b2342..d4a7030d9b 100644
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -371,23 +371,11 @@ VBAPanner::distribute_one_automated (AudioBuffer& src, BufferSet& obufs,
 XMLNode&
 VBAPanner::get_state ()
 {
-	return state (true);
-}
-
-XMLNode&
-VBAPanner::state (bool full_state)
-{
         XMLNode& node (Panner::get_state());
 	node.add_property (X_("type"), _descriptor.name);
 	return node;
 }
 
-int
-VBAPanner::set_state (const XMLNode& node, int /*version*/)
-{
-	return 0;
-}
-
 Panner*
 VBAPanner::factory (boost::shared_ptr<Pannable> p, boost::shared_ptr<Speakers> s)
 {
diff --git a/libs/panners/vbap/vbap.h b/libs/panners/vbap/vbap.h
index 6174600270..752a0c9be6 100644
--- a/libs/panners/vbap/vbap.h
+++ b/libs/panners/vbap/vbap.h
@@ -58,9 +58,7 @@ public:
         std::string describe_parameter (Evoral::Parameter);
         std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
 
-	XMLNode& state (bool full_state);
 	XMLNode& get_state ();
-	int set_state (const XMLNode&, int version);
 
         PBD::AngularVector signal_position (uint32_t n) const;
         boost::shared_ptr<Speakers> get_speakers() const;