MCP: various fixes, plus removal of ui_bind() (just for mackie code)

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

1 files changed, 10 insertions, 13 deletions

diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index 93800aa43b..ba14d9f8fd 100644
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -44,7 +44,6 @@ DeviceInfo::DeviceInfo()
 	, _extenders (0)
 	, _has_two_character_display (true)
 	, _has_master_fader (true)
-	, _has_segmented_display (false)
 	, _has_timecode_display (true)
 	, _has_global_controls (true)
 	, _has_jog_wheel (true)
@@ -238,40 +237,44 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
 		}
 	}
 
-	if ((child = node.child ("DisplaySegments")) != 0) {
-		if ((prop = child->property ("value")) != 0) {
-			_has_segmented_display = string_is_affirmative (prop->value());
-		}
-	}
-
 	if ((child = node.child ("TimecodeDisplay")) != 0) {
 		if ((prop = child->property ("value")) != 0) {
 			_has_timecode_display = string_is_affirmative (prop->value());
 		}
+	} else {
+		_has_timecode_display = false;
 	}
 
 	if ((child = node.child ("GlobalControls")) != 0) {
 		if ((prop = child->property ("value")) != 0) {
 			_has_global_controls = string_is_affirmative (prop->value());
 		}
+	} else {
+		_has_global_controls = false;
 	}
 
 	if ((child = node.child ("JogWheel")) != 0) {
 		if ((prop = child->property ("value")) != 0) {
 			_has_jog_wheel = string_is_affirmative (prop->value());
 		}
+	} else {
+		_has_jog_wheel = false;
 	}
 
 	if ((child = node.child ("TouchSenseFaders")) != 0) {
 		if ((prop = child->property ("value")) != 0) {
 			_has_touch_sense_faders = string_is_affirmative (prop->value());
 		}
+	} else {
+		_has_touch_sense_faders = false;
 	}
 
 	if ((child = node.child ("UsesIPMIDI")) != 0) {
 		if ((prop = child->property ("value")) != 0) {
 			_uses_ipmidi = string_is_affirmative (prop->value());
 		}
+	} else {
+		_uses_ipmidi = false;
 	}
 
 	if ((child = node.child ("LogicControlButtons")) != 0) {
@@ -365,12 +368,6 @@ DeviceInfo::has_two_character_display() const
 }
 
 bool
-DeviceInfo::has_segmented_display() const
-{
-	return _has_segmented_display;
-}
-
-bool
 DeviceInfo::has_timecode_display () const
 {
 	return _has_timecode_display;