MCP: latest patch from Rodrigo:

    * delays Mackie's led initialization until the Mackie is actually ready to receive messages;
    * at the button X function mapping customization interface in Preferences:
          o show specific device names instead of global ones;
          o mark the buttons that are actually available in the device with a *;
          o included a bottom text explaining what the * means;
    * created a DeviceInfo::get_global_button_name(Button::ID) method;
    * included several DEBUG_TRACE in mackies code;
    * renamed device buttons and groups according to the following logic: Mackie buttons are named exactly like a actual (mine) Mackie names them on the interface itself. Logic Control buttons are named exactly like they appear at Logic Pro 7.2.1 Dedicated Control Surface Support manual;
    * improved timecode display (new format);


git-svn-id: svn://localhost/ardour2/branches/3.0@12582 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 3 insertions, 0 deletions

diff --git a/libs/surfaces/mackie/device_info.h b/libs/surfaces/mackie/device_info.h
index 1b97ee75bf..54126c35ee 100644
--- a/libs/surfaces/mackie/device_info.h
+++ b/libs/surfaces/mackie/device_info.h
@@ -73,6 +73,8 @@ class DeviceInfo
 
 	static std::map<std::string,DeviceInfo> device_info;
 	static void reload_device_info();
+	
+	std::string& get_global_button_name(Button::ID);
 
     const std::map<Button::ID,GlobalButtonInfo>& global_buttons() const { return _global_buttons; }
     const std::map<Button::ID,StripButtonInfo>& strip_buttons() const { return _strip_buttons; }
@@ -91,6 +93,7 @@ class DeviceInfo
     bool     _no_handshake;
     bool     _has_meters;
     std::string _name;
+		std::string _global_button_name;
 
     std::map<Button::ID,GlobalButtonInfo> _global_buttons;
     std::map<Button::ID,StripButtonInfo>  _strip_buttons;