Fix binding of automation list undo records to MIDI sources. Should fix the remainde...

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

diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index 9fa374ebc66c842b126c04d28b3c55a5467ba3ae..9f5ed5251b125294f203770c8bced207eca65398 100644 (file)
--- a/libs/pbd/pbd/controllable.h
+++ b/libs/pbd/pbd/controllable.h
@@ -2,7 +2,7 @@
     Copyright (C) 2000-2007 Paul Davis 
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+v    it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
@@ -22,11 +22,12 @@
 
 #include <string>
 #include <set>
+#include <map>
 
-#include <sigc++/trackable.h>
-#include <sigc++/signal.h>
+#include "pbd/signals.h"
+#include <glibmm/thread.h>
 
-#include <pbd/statefuldestructible.h>
+#include "pbd/statefuldestructible.h"
 
 class XMLNode;
 
@@ -34,27 +35,50 @@ namespace PBD {
 
 class Controllable : public PBD::StatefulDestructible {
   public:
-       Controllable (std::string name);
+       enum Flag {
+               Toggle = 0x1,
+               Discrete = 0x2,
+               GainLike = 0x4,
+               IntegerOnly = 0x8
+       };
+
+       Controllable (const std::string& name, Flag f = Flag (0));
        virtual ~Controllable() { Destroyed (this); }
 
        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;
+       PBD::Signal0<void> LearningFinished;
+       static PBD::Signal3<void,PBD::Controllable*,int,int> CreateBinding;
+       static PBD::Signal1<void,PBD::Controllable*> DeleteBinding;
 
-       static sigc::signal<bool,PBD::Controllable*> StartLearning;
-       static sigc::signal<void,PBD::Controllable*> StopLearning;
+       static PBD::Signal1<bool,PBD::Controllable*> StartLearning;
+       static PBD::Signal1<void,PBD::Controllable*> StopLearning;
 
-       static sigc::signal<void,Controllable*> Destroyed;
+       static PBD::Signal1<void,Controllable*> Destroyed;
+       
+       PBD::Signal0<void> Changed;
 
-       sigc::signal<void> Changed;
-
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
        XMLNode& get_state ();
 
-       std::string name() const { return _name; }
+       std::string name()      const { return _name; }
+
+       bool touching () const { return _touching; }
+       void set_touching (bool yn) { _touching = yn; }
+
+       bool is_toggle() const { return _flags & Toggle; }
+       bool is_discrete() const { return _flags & Discrete; }
+       bool is_gain_like() const { return _flags & GainLike; }
+       bool is_integral_only() const { return _flags & IntegerOnly; }
+
+        virtual float lower() const { return 0.0f; }
+        virtual float upper() const { return 1.0f; }
+
+       Flag flags() const { return _flags; }
+       void set_flags (Flag f);
+
+       virtual uint32_t get_discrete_values (std::list<float>&) { return 0; /* no values returned */ }
 
        static Controllable* by_id (const PBD::ID&);
        static Controllable* by_name (const std::string&);
@@ -62,11 +86,14 @@ class Controllable : public PBD::StatefulDestructible {
   private:
        std::string _name;
 
-       void add ();
-       void remove ();
+       Flag        _flags;
+       bool        _touching;
+
+       static void add (Controllable&);
+       static void remove (Controllable*);
 
        typedef std::set<PBD::Controllable*> Controllables;
-       static Glib::Mutex* registry_lock;
+       static Glib::StaticRWLock registry_lock;
        static Controllables registry;
 };
 
@@ -77,11 +104,11 @@ class Controllable : public PBD::StatefulDestructible {
 class IgnorableControllable : public Controllable 
 {
   public: 
-    IgnorableControllable () : PBD::Controllable ("ignoreMe") {}
-    ~IgnorableControllable () {}
+       IgnorableControllable () : PBD::Controllable ("ignoreMe") {}
+       ~IgnorableControllable () {}
     
-    void set_value (float v){}
-    float get_value () const { return 0.0; }
+       void set_value (float /*v*/) {}
+       float get_value () const { return 0.0; }
 };
 
 }