Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(834)

Unified Diff: chrome/browser/extensions/api/audio/audio_service_chromeos.cc

Issue 478493002: Add ability to active multiple devices via the audio API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/audio/OWNERS ('k') | chromeos/dbus/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/audio/audio_service_chromeos.cc
diff --git a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc
index 91a0cd8880425ad149e50d1e4af9b8d7ae3ca256..ce44cf2b36862475a1350fbad37c3d7d92c6a97c 100644
--- a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc
+++ b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc
@@ -9,6 +9,8 @@
#include "base/strings/string_number_conversions.h"
#include "chromeos/audio/audio_device.h"
#include "chromeos/audio/cras_audio_handler.h"
+#include "chromeos/dbus/cras_audio_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
#include "content/public/browser/browser_thread.h"
using content::BrowserThread;
@@ -135,22 +137,63 @@ void AudioServiceImpl::SetActiveDevices(const DeviceIdList& device_list) {
if (!cras_audio_handler_)
return;
+ // De-activate all the nodes with RemoveActive{Input/Output}Node API. This is
+ // kind of hacky, but we don't know which set of nodes are active from
+ // CrasAudioHandler.
+ // TODO(rkc): Fix it in http://crbug.com/402072.
+ chromeos::AudioDeviceList devices;
+ cras_audio_handler_->GetAudioDevices(&devices);
+ for (size_t i = 0; i < devices.size(); ++i) {
+ if (devices[i].is_input) {
+ chromeos::DBusThreadManager::Get()
+ ->GetCrasAudioClient()
+ ->RemoveActiveInputNode(devices[i].id);
+ } else { // output
+ chromeos::DBusThreadManager::Get()
+ ->GetCrasAudioClient()
+ ->RemoveActiveOutputNode(devices[i].id);
+ }
+ }
+
bool input_device_set = false;
bool output_device_set = false;
-
+ std::string active_input_node_ids, active_output_node_ids;
for (size_t i = 0; i < device_list.size(); ++i) {
chromeos::AudioDevice device;
bool found = FindDevice(GetIdFromStr(device_list[i]), &device);
if (found) {
- if (device.is_input && !input_device_set) {
- cras_audio_handler_->SwitchToDevice(device);
- input_device_set = true;
- } else if (!device.is_input && !output_device_set) {
- cras_audio_handler_->SwitchToDevice(device);
- output_device_set = true;
+ if (device.is_input) {
+ if (!input_device_set) {
+ cras_audio_handler_->SwitchToDevice(device);
+ input_device_set = true;
+ } else {
+ active_input_node_ids.push_back(device.id);
+ }
+ } else { // output device
+ if (!output_device_set) {
+ cras_audio_handler_->SwitchToDevice(device);
+ output_device_set = true;
+ } else {
+ active_output_node_ids.push_back(device.id);
+ }
}
}
}
+
+ // Once we have set our devices to active and all the inactive ones have been
+ // set correctly to inactive, go through our active devices again and set
+ // them to active using the AddActiveNode API.
+ // TODO(rkc):Fix this ugly hack in http://crbug.com/402072.
+ for (size_t i = 0; i < active_input_node_ids.size(); ++i) {
+ chromeos::DBusThreadManager::Get()
+ ->GetCrasAudioClient()
+ ->AddActiveInputNode(active_input_node_ids[i]);
+ }
+ for (size_t i = 0; i < active_output_node_ids.size(); ++i) {
+ chromeos::DBusThreadManager::Get()
+ ->GetCrasAudioClient()
+ ->AddActiveOutputNode(active_output_node_ids[i]);
+ }
}
bool AudioServiceImpl::SetDeviceProperties(const std::string& device_id,
« no previous file with comments | « chrome/browser/extensions/api/audio/OWNERS ('k') | chromeos/dbus/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698