globally remove all trailing whitespace from ardour code base.

[ardour.git] / libs / evoral / evoral / Parameter.hpp

diff --git a/libs/evoral/evoral/Parameter.hpp b/libs/evoral/evoral/Parameter.hpp
index 6bd0954b8aa54264ae03a60f08741eac75817361..1412699b4d2fab28c4b92b53f03d021d6a918b5e 100644 (file)
--- a/libs/evoral/evoral/Parameter.hpp
+++ b/libs/evoral/evoral/Parameter.hpp
@@ -1,6 +1,5 @@
-
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
  *
  * Evoral is free software; you can redistribute it and/or modify it under the
@@ -24,11 +23,10 @@
 #include <map>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/format.hpp>
-#include <iostream>
 
-namespace Evoral {
+#include "evoral/visibility.h"
 
+namespace Evoral {
 
 /** ID of a [play|record|automate]able parameter.
  *
@@ -39,15 +37,13 @@ namespace Evoral {
  * This class defines a < operator which is a strict weak ordering, so
  * Parameter may be stored in a std::set, used as a std::map key, etc.
  */
-class Parameter
+class LIBEVORAL_API Parameter
 {
 public:
-       Parameter(uint32_t type, uint8_t channel=0, uint32_t id=0)
+       inline Parameter(uint32_t type, uint8_t channel=0, uint32_t id=0)
                : _type(type), _id(id), _channel(channel)
        {}
 
-       virtual ~Parameter() {}
-
        inline uint32_t type()    const { return _type; }
        inline uint8_t  channel() const { return _channel; }
        inline uint32_t id()      const { return _id; }
@@ -61,35 +57,13 @@ public:
                return (_type == id._type && _channel == id._channel && _id == id._id );
        }
 
+       inline bool operator!=(const Parameter& id) const {
+               return !operator==(id);
+       }
+
        /** Strict weak ordering
         * See: http://www.sgi.com/tech/stl/StrictWeakOrdering.html
-        * Sort Parameters first according to type then to id and lastly to channel.
-        *
-        * Proof:
-        * <ol>
-        * <li>Irreflexivity: f(x, x) is false because of the irreflexivity of \c < in each branch.</li>
-        * <li>Antisymmetry: given x != y, f(x, y) implies !f(y, x) because of the same
-        *     property of \c < in each branch and the symmetry of operator==. </li>
-        * <li>Transitivity: let f(x, y) and f(y, z) => f(x, z) be true.
-        *    We prove by contradiction, assuming the contrary:
-        *    f(x, y) and f(x, z) hold => !f(x, z)
-        *
-        *    That implies one of the following:
-        *    <ol>
-        *      <li> x == z which contradicts the assumption f(x, y) and f(y, x)
-        *                 because of antisymmetry.
-        *      </li>
-        *      <li> f(z, x) is true. That would imply that one of the ivars (we call it i)
-        *           of x is greater than the same ivar in z while all "previous" ivars
-        *           are equal. That would imply that also in y all those "previous"
-        *           ivars are equal and because if x.i > z.i it is impossible
-        *           that there is an y that satisfies x.i < y.i < z.i at the same
-        *           time which contradicts the assumption.
-        *      </li>
-        *      Therefore f(x, z) is true (transitivity)
-        *    </ol>
-        * </li>
-        * </ol>
+        * Sort Parameters first according to type then to channel and lastly to ID.
         */
        inline bool operator<(const Parameter& other) const {
                if (_type < other._type) {
@@ -105,50 +79,12 @@ public:
 
        inline operator bool() const { return (_type != 0); }
 
-       /** Not used in indentity/comparison */
-       struct Metadata {
-               Metadata(double low=0.0, double high=1.0, double mid=0.0)
-                       : min(low), max(high), normal(mid)
-               {}
-               double min;
-               double max;
-               double normal;
-       };
-
-       inline static void set_range(uint32_t type, double min, double max, double normal) {
-               _type_metadata[type] = Metadata(min, max, normal);
-       }
-
-       inline void set_range(double min, double max, double normal) {
-               _metadata = boost::shared_ptr<Metadata>(new Metadata(min, max, normal));
-       }
-
-       inline Metadata& metadata() const {
-               if (_metadata)
-                       return *_metadata.get();
-               else
-                       return _type_metadata[_type];
-       }
-
-       inline double min()    const { return metadata().min; }
-       inline double max()    const { return metadata().max; }
-       inline double normal() const { return metadata().normal; }
-
-protected:
-       // Default copy constructor is ok
-
-       // ID (used in comparison)
+private:
        uint32_t _type;
        uint32_t _id;
        uint8_t  _channel;
-
-       boost::shared_ptr<Metadata> _metadata;
-
-       typedef std::map<uint32_t, Metadata> TypeMetadata;
-       static TypeMetadata _type_metadata;
 };
 
-
 } // namespace Evoral
 
 #endif // EVORAL_PARAMETER_HPP