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, 6 insertions, 4 deletions

diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h
index 4749cd4dce..aad2836306 100644
--- a/libs/ardour/ardour/panner_shell.h
+++ b/libs/ardour/ardour/panner_shell.h
@@ -60,20 +60,22 @@ public:
 	/// The fundamental Panner function
 	void run (BufferSet& src, BufferSet& dest, framepos_t start_frame, framepos_t end_frames, pframes_t nframes);
 
-
-	XMLNode& get_state (void);
-	XMLNode& state (bool full);
+	XMLNode& get_state ();
 	int      set_state (const XMLNode&, int version);
 
-	PBD::Signal0<void> Changed; /* panner and/or outputs count changed */
+	PBD::Signal0<void> Changed; /* panner and/or outputs count and/or bypass state changed */
 
 	boost::shared_ptr<Panner> panner() const { return _panner; }
 	boost::shared_ptr<Pannable> pannable() const { return _pannable; }
 
+	bool bypassed () const;
+	void set_bypassed (bool);
+
   private:
 	void distribute_no_automation (BufferSet& src, BufferSet& dest, pframes_t nframes, gain_t gain_coeff);
 	boost::shared_ptr<Panner> _panner;
 	boost::shared_ptr<Pannable> _pannable;
+	bool _bypassed;
 
 	static float current_automation_version_number;
 };