diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-16 19:05:27 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-16 19:05:27 +0000 |
| commit | 72d17d326e5ffe744ac89570410c38712ab7f79e (patch) | |
| tree | 1f39db60171f9805c7b069eedb8e56148bd3b257 /libs/surfaces/mackie/controls.h | |
| parent | a2897ecef6da6a458aa1de8c2d9973a1e809dca2 (diff) | |
MCP: a fistful of changes
git-svn-id: svn://localhost/ardour2/branches/3.0@11987 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/controls.h')
| -rw-r--r-- | libs/surfaces/mackie/controls.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h index eb9a691972..38dad7ef7f 100644 --- a/libs/surfaces/mackie/controls.h +++ b/libs/surfaces/mackie/controls.h @@ -66,23 +66,17 @@ public: */ Control* in_use_touch_control; - boost::shared_ptr<ARDOUR::AutomationControl> control (bool modified) const { return modified ? modified_ac : normal_ac; } + boost::shared_ptr<ARDOUR::AutomationControl> control () const { return normal_ac; } + virtual void set_control (boost::shared_ptr<ARDOUR::AutomationControl>); - virtual void set_normal_control (boost::shared_ptr<ARDOUR::AutomationControl>); - virtual void set_modified_control (boost::shared_ptr<ARDOUR::AutomationControl>); - - float get_value (bool modified = false); - void set_value (float val, bool modified = false); + float get_value (); + void set_value (float val); - virtual void start_touch (double when, bool modified); - virtual void stop_touch (double when, bool mark, bool modified); + virtual void start_touch (double when); + virtual void stop_touch (double when, bool mark); protected: - /* a control can operate up to 2 different AutomationControls - in any given mode. both of them may be unset at any time. - */ boost::shared_ptr<ARDOUR::AutomationControl> normal_ac; - boost::shared_ptr<ARDOUR::AutomationControl> modified_ac; private: int _id; /* possibly device-dependent ID */ |