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, 12 insertions, 2 deletions

diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index e27a354305..1a063b674e 100644
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -167,15 +167,20 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
 
 	VBox* fkey_packer = manage (new VBox);
 	HBox* profile_packer = manage (new HBox);
-
+	HBox* observation_packer = manage (new HBox);
+	
 	l = manage (new Gtk::Label (_("Profile/Settings:")));
 	profile_packer->pack_start (*l, false, false);
 	profile_packer->pack_start (_profile_combo, true, true);
 	profile_packer->set_spacing (12);
 	profile_packer->set_border_width (12);
+	
+	l = manage (new Gtk::Label (_("* Button available at the original Mackie MCU PRO or current device if enabled (NOT implemented yet). Device specific name presented.")));
+	observation_packer->pack_start (*l, false, false);
 
 	fkey_packer->pack_start (*profile_packer, false, false);
 	fkey_packer->pack_start (function_key_scroller, true, true);
+	fkey_packer->pack_start (*observation_packer, false, false);
 	fkey_packer->set_spacing (12);
 	function_key_scroller.set_size_request (700,700);
 	function_key_scroller.property_shadow_type() = Gtk::SHADOW_NONE;
@@ -340,13 +345,18 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
 
 	TreeModel::Row row;
 	DeviceProfile dp (_cp.device_profile());
+	DeviceInfo di;
 
 	for (int n = 0; n < Mackie::Button::FinalGlobalButton; ++n) {
 
 		Mackie::Button::ID bid = (Mackie::Button::ID) n;
 
 		row = *(function_key_model->append());
-		row[function_key_columns.name] = Mackie::Button::id_to_name (bid);
+		if (di.global_buttons().find (bid) == di.global_buttons().end()) {
+			row[function_key_columns.name] = Mackie::Button::id_to_name (bid);
+		} else {
+			row[function_key_columns.name] = di.get_global_button_name (bid) + "*";
+		}
 		row[function_key_columns.id] = bid;
 
 		Glib::RefPtr<Gtk::Action> act;