Merge branch 'master' into cairocanvas

[ardour.git] / libs / surfaces / control_protocol / control_protocol / control_protocol.h

diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
index 55ea459caeaaa4e5ee181a5eb61af608638d9db0..72726600c97f424611aa598dcc88f6193f4e8339 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -48,8 +48,8 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
 
        std::string name() const { return _name; }
 
-       virtual int set_active (bool yn) = 0;
-       bool get_active() const { return _active; }
+        virtual int set_active (bool yn);
+        bool active() const { return _active; }
 
        virtual int set_feedback (bool /*yn*/) { return 0; }
        virtual bool get_feedback () const { return false; }
@@ -134,16 +134,19 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
        virtual void* get_gui() const { return 0; }
        virtual void  tear_down_gui() { }
 
+        XMLNode& get_state ();
+        static const std::string state_node_name;
+
   protected:
        std::vector<boost::shared_ptr<ARDOUR::Route> > route_table;
        std::string _name;
-       bool _active;
 
        void next_track (uint32_t initial_id);
        void prev_track (uint32_t initial_id);
 
   private:
        ControlProtocol (const ControlProtocol&); /* noncopyable */
+        bool _active;
 };
 
 extern "C" {