Handle audio node stable device ID change

chromeos/dbus/cras_audio_client.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/dbus/cras_audio_client.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 408 matching lines @@
       reader.PopString(&error_message);
     } else {
       error_name = kNoResponseError;
       error_message = "";
     }
     error_callback.Run(error_name, error_message);
   }
 
   bool GetAudioNode(dbus::Response* response,
                     dbus::MessageReader* array_reader,
-                    AudioNode *node) {
+                    AudioNode* node) {
     while (array_reader->HasMoreData()) {
       dbus::MessageReader dict_entry_reader(response);
       dbus::MessageReader value_reader(response);
       std::string key;
       if (!array_reader->PopDictEntry(&dict_entry_reader) ||
           !dict_entry_reader.PopString(&key) ||
           !dict_entry_reader.PopVariant(&value_reader)) {
          return false;
       }
 
@@ skipping 15 matching lines @@
       } else if (key == cras::kActiveProperty) {
         if (!value_reader.PopBool(&node->active))
           return false;
       } else if (key == cras::kPluggedTimeProperty) {
         if (!value_reader.PopUint64(&node->plugged_time))
           return false;
       } else if (key == cras::kMicPositionsProperty) {
         if (!value_reader.PopString(&node->mic_positions))
           return false;
       } else if (key == cras::kStableDeviceIdProperty) {
-        if (!value_reader.PopUint64(&node->stable_device_id))
+        if (!value_reader.PopUint64(&node->stable_device_id_v1))
           return false;
+      } else if (key == cras::kStableDeviceIdNewProperty) {
+        if (!value_reader.PopUint64(&node->stable_device_id_v2))
+          return false;
+        node->has_v2_stable_device_id = true;
       }
     }
 
     return true;
   }
 
   dbus::ObjectProxy* cras_proxy_;
   base::ObserverList<Observer> observers_;
 
   // Note: This should remain the last member so it'll be destroyed and
@@ skipping 31 matching lines @@
 
 CrasAudioClient::~CrasAudioClient() {
 }
 
 // static
 CrasAudioClient* CrasAudioClient::Create() {
   return new CrasAudioClientImpl();
 }
 
 }  // namespace chromeos