make MementoCommand inherit from sigc::trackable so that we don't double-call its...

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

diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index dcc657018ad037dff65e47c6b324084972824c5a..e0b2dfc12b21025c65cf70027208e35aaeaaee97 100644 (file)
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -77,7 +77,7 @@ class PluginInfo {
 typedef boost::shared_ptr<PluginInfo> PluginInfoPtr;
 typedef std::list<PluginInfoPtr> PluginInfoList;
 
-class Plugin : public PBD::StatefulDestructible, public sigc::trackable
+class Plugin : public PBD::StatefulDestructible
 {
   public:
        Plugin (ARDOUR::AudioEngine&, ARDOUR::Session&);
@@ -98,9 +98,8 @@ class Plugin : public PBD::StatefulDestructible, public sigc::trackable
            float step;
            float smallstep;
            float largestep;
-
-               bool min_unbound;
-               bool max_unbound;
+           bool min_unbound;
+           bool max_unbound;
        };
 
        virtual uint32_t unique_id() const = 0;
@@ -162,7 +161,7 @@ class Plugin : public PBD::StatefulDestructible, public sigc::trackable
        void setup_controls ();
 
        struct PortControllable : public PBD::Controllable {
-           PortControllable (Plugin&, uint32_t abs_port_id,
+           PortControllable (std::string name, Plugin&, uint32_t abs_port_id,
                              float lower, float upper, bool toggled, bool logarithmic);
 
            void set_value (float);