diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-01 12:56:20 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-01 12:56:20 +0000 |
| commit | ba5e71b50f53c97c1ce806d9582c4c32970bdcf6 (patch) | |
| tree | 62e95853f436d4bb5dc1514425fb2164f7adba49 /libs/surfaces/mackie/meter.h | |
| parent | bc3aea6f93edf23c19dc672dd5b1f44bca71f571 (diff) | |
MCP: Patch from Rodrigo that:
* implements Metering on/off through Button::Read as per Seablade's suggestion. I choose this button as it's the "Show meters" button in Traktion;
* removes redundant code from Meter::update_transport_rolling();
* renames Meter::update_transport_rolling() to Meter::notify_metering_state_changed();
* renamed Surface::notify_transport_state_changed() to Surface::notify_metering_state_changed();
* renamed Strip::notify_transport_state_changed() to Strip::notify_metering_state_changed();
* created MackieControlProtocol::notify_metering_state_changed() and made MackieControlProtocol::notify_transport_state_changed() use it;
* implemented turning off of timecode display and two char display in Surface::zero_all ();
* implemented master fader zeroing in Surface::zero_all ();
* calling Surfaces->zero_all() at MackieControlProtocol destructor;
* implemented restore of 2nd LCD line content after metering being active.
git-svn-id: svn://localhost/ardour2/branches/3.0@12520 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/meter.h')
| -rw-r--r-- | libs/surfaces/mackie/meter.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/meter.h b/libs/surfaces/mackie/meter.h index fffba9599d..db3e8cffb3 100644 --- a/libs/surfaces/mackie/meter.h +++ b/libs/surfaces/mackie/meter.h @@ -40,11 +40,10 @@ public: static Control* factory (Surface&, int id, const char*, Group&); - void update_transport_rolling(Surface& surface); + void notify_metering_state_changed(Surface& surface, bool transport_is_rolling, bool metering_active); private: bool overload_on; - bool _transport_is_rolling; }; } |