use new ControlList::add() argument

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

diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index dbec03b3961b0ae87ff444f60ca0696afa98842c..eb4b7ff14291c00df03b9b1c7b42720d28371a55 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
-v    it under the terms of the GNU General Public License as published by
+    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.
 
@@ -24,8 +24,9 @@ v    it under the terms of the GNU General Public License as published by
 #include <set>
 #include <map>
 
-#include <boost/signals2.hpp>
-#include <glibmm/thread.h>
+#include "pbd/libpbd_visibility.h"
+#include "pbd/signals.h"
+#include <glibmm/threads.h>
 
 #include "pbd/statefuldestructible.h"
 
@@ -33,67 +34,94 @@ class XMLNode;
 
 namespace PBD {
 
-class Controllable : public PBD::StatefulDestructible {
+class LIBPBD_API Controllable : public PBD::StatefulDestructible {
   public:
-       Controllable (const std::string& name, const std::string& uri);
-       virtual ~Controllable() { Destroyed (this); }
-
-       void set_uri (const std::string&);
-       const std::string& uri() const { return _uri; }
-
-       virtual void set_value (float) = 0;
-       virtual float get_value (void) const = 0;
+       enum Flag {
+               Toggle = 0x1,
+               GainLike = 0x2,
+       };
 
-       boost::signals2::signal<void()> LearningFinished;
-       static boost::signals2::signal<void(PBD::Controllable*,int,int)> CreateBinding;
-       static boost::signals2::signal<void(PBD::Controllable*)> DeleteBinding;
-
-       static boost::signals2::signal<bool(PBD::Controllable*)> StartLearning;
-       static boost::signals2::signal<void(PBD::Controllable*)> StopLearning;
+       Controllable (const std::string& name, Flag f = Flag (0));
+       virtual ~Controllable() { Destroyed (this); }
 
-       static boost::signals2::signal<void(Controllable*)> Destroyed;
+       /* We express Controllable values in one of three ways:
+        * 1. `user' --- as presented to the user (e.g. dB, Hz, etc.)
+        * 2. `interface' --- as used in some cases for the UI representation
+        * (in order to make controls behave logarithmically).
+        * 3. `internal' --- as passed to a processor, track, plugin, or whatever.
+        *
+        * Note that in some cases user and processor may be the same
+        * (and interface different) e.g. frequency, which is presented
+        * to the user and passed to the processor in linear terms, but
+        * which needs log scaling in the interface.
+        *
+        * In other cases, user and interface may be the same (and processor different)
+        * e.g. gain, which is presented to the user in log terms (dB)
+        * but passed to the processor as a linear quantity.
+        */
+
+       /** Set `internal' value */
+       virtual void set_value (double) = 0;
+       /** @return `internal' value */
+       virtual double get_value (void) const = 0;
+
+       PBD::Signal0<void> LearningFinished;
+       static PBD::Signal3<void,PBD::Controllable*,int,int> CreateBinding;
+       static PBD::Signal1<void,PBD::Controllable*> DeleteBinding;
+
+       static PBD::Signal1<bool,PBD::Controllable*> StartLearning;
+       static PBD::Signal1<void,PBD::Controllable*> StopLearning;
+
+       static PBD::Signal1<void,Controllable*> Destroyed;
        
-       boost::signals2::signal<void()> Changed;
+       PBD::Signal0<void> Changed;
 
        int set_state (const XMLNode&, int version);
        XMLNode& get_state ();
 
        std::string name()      const { return _name; }
-       bool        touching () const { return _touching; }
-       
+
+       bool touching () const { return _touching; }
        void set_touching (bool yn) { _touching = yn; }
 
+       bool is_toggle() const { return _flags & Toggle; }
+       bool is_gain_like() const { return _flags & GainLike; }
+
+        virtual double lower() const { return 0.0; }
+        virtual double upper() const { return 1.0; }
+
+       Flag flags() const { return _flags; }
+       void set_flags (Flag f);
+
        static Controllable* by_id (const PBD::ID&);
        static Controllable* by_name (const std::string&);
-       static Controllable* by_uri (const std::string&);
-
+        static const std::string xml_node_name;
   private:
        std::string _name;
-       std::string _uri;
+
+       Flag        _flags;
        bool        _touching;
 
        static void add (Controllable&);
-       static void remove (Controllable&);
+       static void remove (Controllable*);
 
        typedef std::set<PBD::Controllable*> Controllables;
-       typedef std::map<std::string,PBD::Controllable*> ControllablesByURI;
-       static Glib::StaticRWLock registry_lock;
+        static Glib::Threads::RWLock registry_lock;
        static Controllables registry;
-       static ControllablesByURI registry_by_uri;
 };
 
 /* a utility class for the occasions when you need but do not have
    a Controllable
 */
 
-class IgnorableControllable : public Controllable 
+class LIBPBD_API IgnorableControllable : public Controllable 
 {
   public: 
-       IgnorableControllable () : PBD::Controllable ("ignoreMe", std::string()) {}
+       IgnorableControllable () : PBD::Controllable ("ignoreMe") {}
        ~IgnorableControllable () {}
     
-       void set_value (float /*v*/) {}
-       float get_value () const { return 0.0; }
+       void set_value (double /*v*/) {}
+       double get_value () const { return 0.0; }
 };
 
 }