new button IDs, one for MCP one for LCP, plus methods associated with them; SSL Nucleus now declares itself to be using Logic Control

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

1 files changed, 14 insertions, 10 deletions

diff --git a/libs/surfaces/mackie/device_info.h b/libs/surfaces/mackie/device_info.h
index 9ca51cae71..7b279565db 100644
--- a/libs/surfaces/mackie/device_info.h
+++ b/libs/surfaces/mackie/device_info.h
@@ -76,19 +76,23 @@ class DeviceInfo
     const std::map<Button::ID,StripButtonInfo>& strip_buttons() const { return _strip_buttons; }
 	
   private:
-	uint32_t _strip_cnt;
-	uint32_t _extenders;
-	bool     _has_two_character_display;
-	bool     _has_master_fader;
-	bool     _has_segmented_display;
-	bool     _has_timecode_display;
-	bool     _has_global_controls;
-	bool     _has_jog_wheel;
-	bool     _has_touch_sense_faders;
-	std::string _name;
+    uint32_t _strip_cnt;
+    uint32_t _extenders;
+    bool     _has_two_character_display;
+    bool     _has_master_fader;
+    bool     _has_segmented_display;
+    bool     _has_timecode_display;
+    bool     _has_global_controls;
+    bool     _has_jog_wheel;
+    bool     _has_touch_sense_faders;
+    bool     _uses_logic_control_buttons;
+    std::string _name;
 
     std::map<Button::ID,GlobalButtonInfo> _global_buttons;
     std::map<Button::ID,StripButtonInfo>  _strip_buttons;
+
+    void logic_control_buttons ();
+    void mackie_control_buttons ();
 };
 
 class DeviceProfile