assert() to help find some possible causes of #2991. Fix some confusion with GTK...

[ardour.git] / libs / ardour / ardour / plugin_insert.h

diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 82111a5a4df180e661989d9e2e116b27793f87d4..25f380c41b65dee8ee55bb2d16cf178725fdfa8c 100644 (file)
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -25,7 +25,6 @@
 
 #include <boost/weak_ptr.hpp>
 
-#include <sigc++/signal.h>
 #include "ardour/ardour.h"
 #include "ardour/types.h"
 #include "ardour/processor.h"
@@ -45,16 +44,16 @@ class PluginInsert : public Processor
 {
   public:
        PluginInsert (Session&, boost::shared_ptr<Plugin>);
-       PluginInsert (Session&, const XMLNode&, int version = 3000);
+       PluginInsert (Session&, const XMLNode&);
        ~PluginInsert ();
 
        static const std::string port_automation_node_name;
 
        XMLNode& state(bool);
        XMLNode& get_state(void);
-       int set_state(const XMLNode&, int version = 3000);
+       int set_state(const XMLNode&, int version);
 
-       void run (BufferSet& in, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+       void run (BufferSet& in, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
        void silence (nframes_t nframes);
 
        void activate ();
@@ -107,7 +106,7 @@ class PluginInsert : public Processor
 
        void collect_signal_for_analysis(nframes_t nframes);
 
-       sigc::signal<void, BufferSet*, BufferSet*> AnalysisDataGathered;
+       PBD::Signal2<void,BufferSet*, BufferSet*> AnalysisDataGathered;
 
   private:
        /* disallow copy construction */
@@ -134,9 +133,10 @@ class PluginInsert : public Processor
        void automation_run (BufferSet& bufs, nframes_t nframes);
        void connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t offset, bool with_auto, nframes_t now = 0);
 
-       void init ();
        void set_automatable ();
        void auto_state_changed (Evoral::Parameter which);
+       void set_parameter_state (const XMLNode& node, int version);
+       void set_parameter_state_2X (const XMLNode& node, int version);
 
        int32_t count_for_configuration (ChanCount in, ChanCount out) const;