diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-11 22:32:02 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-11 22:32:02 +0000 |
| commit | bc52377c3eb176df91ae09e2ab0650fd50697726 (patch) | |
| tree | 9aaa20feb329b5bc96296d189a3610a8570fb20e /libs/surfaces/mackie/strip.h | |
| parent | 96d4ba88d1fa58947c305d1cae1366914469d220 (diff) | |
MCP: reverse operation of cursor up/down in zoom mode; more tracign for vpot
git-svn-id: svn://localhost/ardour2/branches/3.0@11920 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/strip.h')
| -rw-r--r-- | libs/surfaces/mackie/strip.h | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h index 228daf753f..ec030399a5 100644 --- a/libs/surfaces/mackie/strip.h +++ b/libs/surfaces/mackie/strip.h @@ -52,26 +52,6 @@ public: void add (Control & control); int index() const { return _index; } // zero based - Button & solo(); - Button & recenable(); - Button & mute(); - Button & select(); - Button & vselect(); - Button & fader_touch(); - Pot & vpot(); - Fader & gain(); - Meter& meter (); - - bool has_solo() const { return _solo != 0; } - bool has_recenable() const { return _recenable != 0; } - bool has_mute() const { return _mute != 0; } - bool has_select() const { return _select != 0; } - bool has_vselect() const { return _vselect != 0; } - bool has_fader_touch() const { return _fader_touch != 0; } - bool has_vpot() const { return _vpot != 0; } - bool has_gain() const { return _gain != 0; } - bool has_meter() const { return _meter != 0; } - void set_route (boost::shared_ptr<ARDOUR::Route>); // call all signal handlers manually @@ -98,7 +78,7 @@ private: Button* _vselect; Button* _fader_touch; Pot* _vpot; - Fader* _gain; + Fader* _fader; Meter* _meter; int _index; Surface* _surface; @@ -107,11 +87,8 @@ private: boost::shared_ptr<ARDOUR::Route> _route; PBD::ScopedConnectionList route_connections; - // Last written values for the gain and pan, to avoid overloading - // the midi connection to the surface - float _last_gain_written; - MidiByteArray _last_pan_written; - + float _last_fader_position_written; + float _last_vpot_position_written; void notify_solo_changed (); void notify_mute_changed (); @@ -127,8 +104,6 @@ private: }; -std::ostream & operator << (std::ostream &, const Strip &); - } #endif /* __ardour_mackie_control_protocol_strip_h__ */ |