MCP: more surface properties, correctly close IOSources when switching surfaces; write select button msgs one by one, change port name back to generic terms

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

1 files changed, 26 insertions, 0 deletions

diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index d0e120ea95..88ea659fdf 100644
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -45,6 +45,8 @@ DeviceInfo::DeviceInfo()
 	, _has_master_fader (true)
 	, _has_segmented_display (false)
 	, _has_timecode_display (true)
+	, _has_global_controls (true)
+	, _has_jog_wheel (true)
 	, _name (X_("Mackie Control Universal Pro"))
 {
 	
@@ -114,6 +116,18 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
 		}
 	}
 
+	if ((child = node.child ("GlobalControls")) != 0) {
+		if ((prop = child->property ("value")) != 0) {
+			_has_global_controls = string_is_affirmative (prop->value());
+		}
+	}
+
+	if ((child = node.child ("JogWheel")) != 0) {
+		if ((prop = child->property ("value")) != 0) {
+			_has_jog_wheel = string_is_affirmative (prop->value());
+		}
+	}
+
 	return 0;
 }
 
@@ -159,6 +173,18 @@ DeviceInfo::has_timecode_display () const
 	return _has_timecode_display;
 }
 
+bool
+DeviceInfo::has_global_controls () const
+{
+	return _has_global_controls;
+}
+
+bool
+DeviceInfo::has_jog_wheel () const
+{
+	return _has_jog_wheel;
+}
+
 static const char * const devinfo_env_variable_name = "ARDOUR_MCP_DEVINFO_PATH";
 static const char* const devinfo_dir_name = "mcp_devices";
 static const char* const devinfo_suffix = ".xml";