remove a couple of boost::signals2 trouble spots; fix some --strict compile time...

[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 2bd23f5b48ae730c03eef81f587799cfa917de7f..c80ba9b4b67fb46c0b87864b0ac3d11a0daf2cd9 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -16,7 +16,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef ardour_control_protocols_h
@@ -25,16 +24,17 @@
 #include <string>
 #include <vector>
 #include <list>
-#include <sigc++/sigc++.h>
-#include <pbd/stateful.h>
-#include <control_protocol/basic_ui.h>
+#include <boost/shared_ptr.hpp>
+#include "pbd/stateful.h"
+#include "pbd/signals.h"
+#include "control_protocol/basic_ui.h"
 
 namespace ARDOUR {
 
 class Route;
 class Session;
 
-class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI {
+class ControlProtocol : virtual public sigc::trackable, public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI {
   public:
        ControlProtocol (Session&, std::string name);
        virtual ~ControlProtocol();
@@ -44,17 +44,22 @@ class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI
        virtual int set_active (bool yn) = 0;
        bool get_active() const { return _active; }
 
-       sigc::signal<void> ActiveChanged;
+       virtual int set_feedback (bool /*yn*/) { return 0; }
+       virtual bool get_feedback () const { return false; }
+
+       virtual void route_list_changed () {}
+
+       PBD::Signal0<void> ActiveChanged;
 
        /* signals that a control protocol can emit and other (presumably graphical)
           user interfaces can respond to
        */
 
-       static sigc::signal<void> ZoomToSession;
-       static sigc::signal<void> ZoomIn;
-       static sigc::signal<void> ZoomOut;
-       static sigc::signal<void> Enter;
-       static sigc::signal<void,float> ScrollTimeline;
+       static PBD::Signal0<void> ZoomToSession;
+       static PBD::Signal0<void> ZoomIn;
+       static PBD::Signal0<void> ZoomOut;
+       static PBD::Signal0<void> Enter;
+       static PBD::Signal1<void,float> ScrollTimeline;
 
        /* the model here is as follows:
 
@@ -73,7 +78,7 @@ class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI
        */
 
        void set_route_table_size (uint32_t size);
-       void set_route_table (uint32_t table_index, ARDOUR::Route*);
+       void set_route_table (uint32_t table_index, boost::shared_ptr<ARDOUR::Route>);
        bool set_route_table (uint32_t table_index, uint32_t remote_control_id);
 
        void route_set_rec_enable (uint32_t table_index, bool yn);
@@ -94,12 +99,17 @@ class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI
        std::string route_get_name (uint32_t table_index);
 
   protected:
-       std::vector<ARDOUR::Route*> route_table;
+       std::vector<boost::shared_ptr<ARDOUR::Route> > route_table;
        std::string _name;
        bool _active;
 
+       void add_strip (std::list<boost::shared_ptr<ARDOUR::Route> >);
+
        void next_track (uint32_t initial_id);
        void prev_track (uint32_t initial_id);
+
+  private:
+       ControlProtocol (const ControlProtocol&); /* noncopyable */
 };
 
 extern "C" {
@@ -109,6 +119,7 @@ extern "C" {
            void*       ptr;       /* protocol can store a value here */
            void*       module;    /* not for public access */
            int         mandatory; /* if non-zero, always load and do not make optional */
+           bool        supports_feedback; /* if true, protocol has toggleable feedback mechanism */
            bool             (*probe)(ControlProtocolDescriptor*);
            ControlProtocol* (*initialize)(ControlProtocolDescriptor*,Session*);
            void             (*destroy)(ControlProtocolDescriptor*,ControlProtocol*);