mackie: don't overload "Audio Instruments" and "Instruments" buttons.

[ardour.git] / libs / surfaces / mackie / device_info.cc

diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index b0ce131e003d991ea55abfffd9b4ee6d55e86a1d..b94cb055447a627736f38cc79520459c92201c48 100644 (file)
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -57,6 +57,7 @@ DeviceInfo::DeviceInfo()
        , _uses_ipmidi (false)
        , _no_handshake (false)
        , _has_meters (true)
+       , _has_separate_meters (false)
        , _device_type (MCU)
        , _name (X_("Mackie Control Universal Pro"))
 {
@@ -343,6 +344,14 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
                _has_meters = true;
        }
 
+       if ((child = node.child ("HasSeparateMeters")) != 0) {
+               if ((prop = child->property ("value")) != 0) {
+                       _has_meters = _has_separate_meters = string_is_affirmative (prop->value());
+               }
+       } else {
+               _has_separate_meters = false;
+       }
+
        if ((child = node.child ("LogicControlButtons")) != 0) {
                if ((prop = child->property ("value")) != 0) {
                        _uses_logic_control_buttons = string_is_affirmative (prop->value());
@@ -439,6 +448,12 @@ DeviceInfo::has_meters() const
        return _has_meters;
 }
 
+bool
+DeviceInfo::has_separate_meters() const
+{
+       return _has_meters;
+}
+
 bool
 DeviceInfo::has_two_character_display() const
 {