diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-03-04 00:35:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-03-04 00:35:01 +0000 |
| commit | cc67b6bb1f96ba7744e68bf74f56f3c53e317f95 (patch) | |
| tree | 63c2d8dd8c3f0df32fd6a1c6c99e82caafaea648 /libs/pbd | |
| parent | 29558bd2724b1d87b1e5009e55823272cb341f92 (diff) | |
Remove unused bits.
git-svn-id: svn://localhost/ardour2/branches/3.0@9060 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/enums.cc | 2 | ||||
| -rw-r--r-- | libs/pbd/pbd/controllable.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/libs/pbd/enums.cc b/libs/pbd/enums.cc index 559af3a307..7081503cb1 100644 --- a/libs/pbd/enums.cc +++ b/libs/pbd/enums.cc @@ -40,8 +40,6 @@ setup_libpbd_enums () #define REGISTER_CLASS_ENUM(t,e) i.push_back (t::e); s.push_back (#e) REGISTER_CLASS_ENUM (Controllable, Toggle); - REGISTER_CLASS_ENUM (Controllable, Discrete); REGISTER_CLASS_ENUM (Controllable, GainLike); - REGISTER_CLASS_ENUM (Controllable, IntegerOnly); REGISTER (controllable_flags); } diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index 864a68b1a8..7379f36027 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -37,9 +37,7 @@ 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)); @@ -79,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; } @@ -89,8 +85,6 @@ 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; |