extensions/shell/browser/shell_audio_controller_chromeos.cc - Issue 596603002: Supports multiple active input/output audio nodes in CrasAudioHandler.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/shell/browser/shell_audio_controller_chromeos.cc

Issue 596603002: Supports multiple active input/output audio nodes in CrasAudioHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix another api name change in shell_audio_controller_chromeos_unittest.cc. Created 6 years, 3 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

« chromeos/audio/cras_audio_handler_unittest.cc ('K') | « chromeos/audio/cras_audio_handler_unittest.cc ('k') | extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/shell/browser/shell_audio_controller_chromeos.cc

diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.cc b/extensions/shell/browser/shell_audio_controller_chromeos.cc

index 0ee6150a3420a4aec0e98261d7e3191a4d7be30a..312a3a571b8ecd9ba43eb3ddb0e4c50836f874fb 100644

--- a/extensions/shell/browser/shell_audio_controller_chromeos.cc

+++ b/extensions/shell/browser/shell_audio_controller_chromeos.cc

@@ -116,13 +116,13 @@ void ShellAudioController::ActivateDevices() {

best_output = it->id;

}

- if (best_input && best_input != handler->GetActiveInputNode()) {

+ if (best_input && best_input != handler->GetPrimaryActiveInputNode()) {

const chromeos::AudioDevice* device = GetDevice(devices, best_input);

DCHECK(device);

VLOG(1) << "Activating input device: " << device->ToString();

handler->SwitchToDevice(*device);

}

- if (best_output && best_output != handler->GetActiveOutputNode()) {

+ if (best_output && best_output != handler->GetPrimaryActiveOutputNode()) {

const chromeos::AudioDevice* device = GetDevice(devices, best_output);

DCHECK(device);

VLOG(1) << "Activating output device: " << device->ToString();