Handle audio node stable device ID change

chromeos/audio/audio_device.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/audio/audio_device.h"
 
 #include <stdint.h>
 
 #include "base/format_macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 97 matching lines @@
   else if (node_type.find("LINEOUT") != std::string::npos)
     return AUDIO_TYPE_LINEOUT;
   else if (node_type.find("POST_MIX_LOOPBACK") != std::string::npos)
     return AUDIO_TYPE_POST_MIX_LOOPBACK;
   else if (node_type.find("POST_DSP_LOOPBACK") != std::string::npos)
     return AUDIO_TYPE_POST_DSP_LOOPBACK;
   else
     return AUDIO_TYPE_OTHER;
 }
 
-AudioDevice::AudioDevice()
-    : is_input(false),
-      id(0),
-      stable_device_id(0),
-      display_name(""),
-      type(AUDIO_TYPE_OTHER),
-      priority(0),
-      active(false),
-      plugged_time(0) {}
+AudioDevice::AudioDevice() {}
 
 AudioDevice::AudioDevice(const AudioNode& node) {
   is_input = node.is_input;
   id = node.id;
-  stable_device_id = node.stable_device_id;
+  stable_device_id_version = node.StableDeviceIdVersion();
+  stable_device_id = node.StableDeviceId();
+  if (stable_device_id_version == 2)
+    deprecated_stable_device_id = node.stable_device_id_v1;
   type = GetAudioType(node.type);
   if (!node.name.empty() && node.name != "(default)")
     display_name = node.name;
   else
     display_name = node.device_name;
   device_name = node.device_name;
   mic_positions = node.mic_positions;
   priority = GetDevicePriority(type, node.is_input);
   active = node.active;
   plugged_time = node.plugged_time;
 }
 
 AudioDevice::AudioDevice(const AudioDevice& other) = default;
 
 std::string AudioDevice::ToString() const {
+  if (stable_device_id_version == 0) {
+    return "Null device";
+  }
+
   std::string result;
   base::StringAppendF(&result,
                       "is_input = %s ",
                       is_input ? "true" : "false");
   base::StringAppendF(&result,
                       "id = 0x%" PRIx64 " ",
                       id);
-  base::StringAppendF(&result,
-                      "stable_device_id = 0x%" PRIx64 " ",
+  base::StringAppendF(&result, "stable_device_id_version = %d",
+                      stable_device_id_version);
+  base::StringAppendF(&result, "stable_device_id = 0x%" PRIx64 " ",
                       stable_device_id);
-  base::StringAppendF(&result,
-                      "display_name = %s ",
-                      display_name.c_str());
+  base::StringAppendF(&result, "deprecated_stable_device_id = 0x%" PRIx64 " ",
+                      deprecated_stable_device_id);
+  base::StringAppendF(&result, "display_name = %s ", display_name.c_str());
   base::StringAppendF(&result,
                       "device_name = %s ",
                       device_name.c_str());
   base::StringAppendF(&result,
                       "type = %s ",
                       GetTypeString(type).c_str());
   base::StringAppendF(&result,
                       "active = %s ",
                       active ? "true" : "false");
   base::StringAppendF(&result,
                       "plugged_time= %s ",
                       base::Uint64ToString(plugged_time).c_str());
   base::StringAppendF(&result, "mic_positions = %s ", mic_positions.c_str());
 
   return result;
 }
 
 }  // namespace chromeos