Do not re-select active device if a lower priority device is hotplugged in and user has already sel…

chromeos/audio/cras_audio_handler.h

 // 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.
 
 #ifndef CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_
 #define CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_
 
 #include <queue>
 
 #include "base/basictypes.h"
@@ skipping 251 matching lines @@
                           uint64* current_active_node_id);
 
   // Returns true if the audio nodes change is caused by some non-active
   // audio nodes unplugged.
   bool NonActiveDeviceUnplugged(size_t old_devices_size,
                                 size_t new_device_size,
                                 uint64 current_active_node);
 
   // Returns true if there is any device change for for input or output,
   // specified by |is_input|.
-  bool HasDeviceChange(const AudioNodeList& new_nodes, bool is_input);
+  // The new discovered nodes are returned in |new_discovered|.
+  bool HasDeviceChange(const AudioNodeList& new_nodes,
+                       bool is_input,
+                       AudioNodeList* new_discovered);
 
   // Handles dbus callback for GetNodes.
   void HandleGetNodes(const chromeos::AudioNodeList& node_list, bool success);
 
   // Handles the dbus error callback.
   void HandleGetNodesError(const std::string& error_name,
                            const std::string& error_msg);
 
   // Adds an active node.
   // If there is no active node, |node_id| will be switched to become the
   // primary active node. Otherwise, it will be added as an additional active
   // node.
   void AddActiveNode(uint64 node_id, bool notify);
 
   // Adds |node_id| into additional active nodes.
   void AddAdditionalActiveNode(uint64 node_id, bool notify);
 
   // Removes |node_id| from additional active nodes.
   void RemoveActiveNodeInternal(uint64 node_id, bool notify);
 
-  // Returns true if |device| is not found in audio_devices_, or it is found
-  // but changed its |active| property.
-  bool FoundNewOrChangedDevice(const AudioDevice& device);
+  enum DeviceStatus {
+    OLD_DEVICE,
+    NEW_DEVICE,
+    CHANGED_DEVICE,
+  };
+
+  // Checks if |device| is a newly discovered, changed, or existing device for
+  // the nodes sent from NodesChanged signal.
+  DeviceStatus CheckDeviceStatus(const AudioDevice& device);
 
   void NotifyActiveNodeChanged(bool is_input);
 
   scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler_;
   ObserverList<AudioObserver> observers_;
 
   // Audio data and state.
   AudioDeviceMap audio_devices_;
 
   AudioDevicePriorityQueue input_devices_pq_;
@@ skipping 14 matching lines @@
   bool log_errors_;
 
   base::WeakPtrFactory<CrasAudioHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CrasAudioHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_