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 c0961645ab4fdf42f2d3b2d6a958ab15155d5863..c80ba9b4b67fb46c0b87864b0ac3d11a0daf2cd9 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -25,16 +25,16 @@
 #include <vector>
 #include <list>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/sigc++.h>
-#include <pbd/stateful.h>
-#include <control_protocol/basic_ui.h>
+#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,20 +44,22 @@ class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI
        virtual int set_active (bool yn) = 0;
        bool get_active() const { return _active; }
 
-       virtual int set_feedback (bool yn) { return 0; }
+       virtual int set_feedback (bool /*yn*/) { return 0; }
        virtual bool get_feedback () const { return false; }
 
-       sigc::signal<void> ActiveChanged;
+       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:
 
@@ -101,8 +103,13 @@ class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI
        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" {