media/audio/alsa/audio_manager_alsa.cc - Issue 1374993003: Re-land attempt 2: Add localized default audio device names.

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: media/audio/alsa/audio_manager_alsa.cc

Issue 1374993003: Re-land attempt 2: Add localized default audio device names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Windows test. Created 5 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

« no previous file with comments | « content/browser/renderer_host/media/audio_output_device_enumerator.cc ('k') | media/audio/android/audio_android_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/audio/alsa/audio_manager_alsa.cc

diff --git a/media/audio/alsa/audio_manager_alsa.cc b/media/audio/alsa/audio_manager_alsa.cc

index 325c3720d3a6554f62d37986982ee34975c9e713..1d658fcd3baf33f868c8a96b24236cf559905c3f 100644

--- a/media/audio/alsa/audio_manager_alsa.cc

+++ b/media/audio/alsa/audio_manager_alsa.cc

@@ -163,9 +163,9 @@ void AudioManagerAlsa::GetAlsaDevicesInfo(

// still empty. Note, pulse has exclusively opened the default

// device, so we must open the device via the "default" moniker.

if (device_names->empty()) {

- device_names->push_front(media::AudioDeviceName(

- AudioManagerBase::kDefaultDeviceName,

- AudioManagerBase::kDefaultDeviceId));

+ device_names->push_front(

+ media::AudioDeviceName(AudioManager::GetDefaultDeviceName(),

+ AudioManagerBase::kDefaultDeviceId));

}

// Get the unique device name for the device.