switch to using boost::signals2 instead of sigc++, at least for libardour. not finish...

[ardour.git] / libs / pbd / pbd / controllable.h

diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index 9750ebe56ed1c66faccbc5d1f2fd934150bd035f..dbec03b3961b0ae87ff444f60ca0696afa98842c 100644 (file)
--- a/libs/pbd/pbd/controllable.h
+++ b/libs/pbd/pbd/controllable.h
@@ -24,8 +24,7 @@ v    it under the terms of the GNU General Public License as published by
 #include <set>
 #include <map>
 
-#include <sigc++/trackable.h>
-#include <sigc++/signal.h>
+#include <boost/signals2.hpp>
 #include <glibmm/thread.h>
 
 #include "pbd/statefuldestructible.h"
@@ -45,16 +44,16 @@ class Controllable : public PBD::StatefulDestructible {
        virtual void set_value (float) = 0;
        virtual float get_value (void) const = 0;
 
-       sigc::signal<void> LearningFinished;
-       static sigc::signal<void,PBD::Controllable*,int,int> CreateBinding;
-       static sigc::signal<void,PBD::Controllable*> DeleteBinding;
+       boost::signals2::signal<void()> LearningFinished;
+       static boost::signals2::signal<void(PBD::Controllable*,int,int)> CreateBinding;
+       static boost::signals2::signal<void(PBD::Controllable*)> DeleteBinding;
 
-       static sigc::signal<bool,PBD::Controllable*> StartLearning;
-       static sigc::signal<void,PBD::Controllable*> StopLearning;
+       static boost::signals2::signal<bool(PBD::Controllable*)> StartLearning;
+       static boost::signals2::signal<void(PBD::Controllable*)> StopLearning;
 
-       static sigc::signal<void,Controllable*> Destroyed;
-
-       sigc::signal<void> Changed;
+       static boost::signals2::signal<void(Controllable*)> Destroyed;
+       
+       boost::signals2::signal<void()> Changed;
 
        int set_state (const XMLNode&, int version);
        XMLNode& get_state ();
@@ -73,8 +72,8 @@ class Controllable : public PBD::StatefulDestructible {
        std::string _uri;
        bool        _touching;
 
-       void add ();
-       void remove ();
+       static void add (Controllable&);
+       static void remove (Controllable&);
 
        typedef std::set<PBD::Controllable*> Controllables;
        typedef std::map<std::string,PBD::Controllable*> ControllablesByURI;