MCP: redesign to allow device-specific button IDs, since we know that at least one device (nucleus) does not honor mackie's specification document

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

1 files changed, 2 insertions, 5 deletions

diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 6bdb575847..5bcd9ebde9 100644
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -53,13 +53,10 @@ public:
 
 	std::map<int,Fader*> faders;
 	std::map<int,Pot*> pots;
-	std::map<int,Button*> buttons;
+	std::map<int,Button*> buttons; // index is device-DEPENDENT
 	std::map<int,Led*> leds;
 	std::map<int,Meter*> meters;
-
-	/// no strip controls in here because they usually
-	/// have the same names.
-	std::map<std::string,Control*> controls_by_name;
+	std::map<int,Control*> controls_by_device_independent_id;
 	
 	Mackie::JogWheel* jog_wheel() const { return _jog_wheel; }