tweak transport bar spacing

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

diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index 3ae27f72c2f2650558492ff34ea8220105ab27b9..9c059e9401c81ce7f077990c040f627cab8bfd04 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.
 
@@ -37,15 +37,24 @@ class Controllable : public PBD::StatefulDestructible {
   public:
        enum Flag {
                Toggle = 0x1,
-               Discrete = 0x2,
-               GainLike = 0x4,
-               IntegerOnly = 0x8
+               GainLike = 0x2,
        };
 
        Controllable (const std::string& name, Flag f = Flag (0));
        virtual ~Controllable() { Destroyed (this); }
 
+       /* We express Controllable values in one of three ways:
+        * 1. `user' --- as presented to the user (e.g. dB, Hz etc.)
+        * 2. `UI' --- as used in some cases for the internal representation
+        *    of the UI.  This may be the same as `user', or may be something
+        *    like the natural log of frequency in order that sliders operate
+        *    in a logarithmic fashion.
+        * 3. `plugin' --- as passed to a plugin.
+        */
+
+       /** Set `user' value */
        virtual void set_value (double) = 0;
+       /** @return `user' value */
        virtual double get_value (void) const = 0;
 
        PBD::Signal0<void> LearningFinished;
@@ -68,9 +77,7 @@ class Controllable : public PBD::StatefulDestructible {
        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 double lower() const { return 0.0; }
         virtual double upper() const { return 1.0; }
@@ -78,11 +85,9 @@ class Controllable : public PBD::StatefulDestructible {
        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&);
-
+        static const std::string xml_node_name;
   private:
        std::string _name;