Simplify logic behind chrome.audio.setActiveDevices

chromeos/audio/cras_audio_handler.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/cras_audio_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 250 matching lines @@
   for (uint64_t id : new_active_ids) {
     const chromeos::AudioDevice* device = GetDeviceFromId(id);
     if (!device)
       continue;
     if (device->is_input)
       input_devices.push_back(*device);
     else
       output_devices.push_back(*device);
   }
   if (!input_devices.empty())
-    SetActiveNodes(input_devices, true /* is_input */);
+    SetActiveDevices(input_devices, true /* is_input */);
   if (!output_devices.empty())
-    SetActiveNodes(output_devices, false /* is_input */);
+    SetActiveDevices(output_devices, false /* is_input */);
 }
 
-void CrasAudioHandler::SetActiveNodes(const AudioDeviceList& devices,
+bool CrasAudioHandler::SetActiveInputNodes(const NodeIdList& node_ids) {
+  return SetActiveNodes(node_ids, true /* is_input */);
+}
+
+bool CrasAudioHandler::SetActiveOutputNodes(const NodeIdList& node_ids) {
+  return SetActiveNodes(node_ids, false /* is_input */);
+}
+
+bool CrasAudioHandler::SetActiveNodes(const NodeIdList& node_ids,
                                       bool is_input) {
+  chromeos::AudioDeviceList devices;
+  for (uint64_t id : node_ids) {
+    const chromeos::AudioDevice* device = GetDeviceFromId(id);
+    if (!device || device->is_input != is_input)
+      return false;
+
+    devices.push_back(*device);
+  }
+
+  SetActiveDevices(devices, is_input);
+  return true;
+}
+
+void CrasAudioHandler::SetActiveDevices(const AudioDeviceList& devices,
+                                        bool is_input) {
   std::set<uint64_t> new_active_ids;
   for (const auto& active_device : devices) {
     CHECK_EQ(is_input, active_device.is_input);
     new_active_ids.insert(active_device.id);
   }
 
   bool active_devices_changed = false;
 
   // If  primary active node has to be switched, do that before adding or
   // removing any other active devices. Switching to a device can change
@@ skipping 1098 matching lines @@
                      hdmi_rediscover_grace_period_duration_in_ms_),
       this, &CrasAudioHandler::UpdateAudioAfterHDMIRediscoverGracePeriod);
 }
 
 void CrasAudioHandler::SetHDMIRediscoverGracePeriodForTesting(
     int duration_in_ms) {
   hdmi_rediscover_grace_period_duration_in_ms_ = duration_in_ms;
 }
 
 }  // namespace chromeos