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

1 files changed, 4 insertions, 1 deletions

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 0fd5d8c8a2..eb3cc22b8c 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -128,6 +128,7 @@ class MackieControlProtocol
 	bool     flip_mode () const { return _flip_mode; }
 	ViewMode view_mode () const { return _view_mode; }
 	bool zoom_mode () const { return _zoom_mode; }
+	bool     metering_active () const { return _metering_active; }
 
 	void set_view_mode (ViewMode);
 	void set_flip_mode (bool);
@@ -164,6 +165,7 @@ class MackieControlProtocol
 	void notify_record_state_changed();
 	void notify_transport_state_changed();
 	void notify_loop_state_changed();
+	void notify_metering_state_changed();
 	// mainly to pick up punch-in and punch-out
 	void notify_parameter_changed(std::string const &);
 	void notify_solo_active_changed(bool);
@@ -171,7 +173,7 @@ class MackieControlProtocol
 	/// Turn timecode on and beats off, or vice versa, depending
 	/// on state of _timecode_type
 	void update_timecode_beats_led();
-  
+	
 	/// this is called to generate the midi to send in response to a button press.
 	void update_led(Mackie::Surface&, Mackie::Button & button, Mackie::LedState);
   
@@ -286,6 +288,7 @@ class MackieControlProtocol
 	ButtonMap                 button_map;
 	int16_t                  _ipmidi_base;
 	bool                      needs_ipmidi_restart;
+	bool                     _metering_active;
 
 	ARDOUR::RouteNotificationList _last_selected_routes;