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

Unified Diff: media/audio/win/audio_manager_win.cc

Issue 1339183002: Add localized default audio device names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix descriptions. 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
Index: media/audio/win/audio_manager_win.cc
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index 7ef9a8470cdf86ddde7b45ac7eb9d6d25da18a6a..a18c831519c20be7fa3dab134a8da5c042e8ffb0 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -22,6 +22,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/win/windows_version.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/win/audio_device_listener_win.h"
#include "media/audio/win/audio_low_latency_input_win.h"
@@ -35,6 +37,7 @@
#include "media/base/channel_layout.h"
#include "media/base/limits.h"
#include "media/base/media_switches.h"
+#include "ui/base/l10n/l10n_util.h"
// Libraries required for the SetupAPI and Wbem APIs used here.
#pragma comment(lib, "setupapi.lib")
@@ -286,12 +289,12 @@ void AudioManagerWin::GetAudioDeviceNamesImpl(
if (!device_names->empty()) {
AudioDeviceName name;
if (enumeration_type() == kMMDeviceEnumeration) {
- name.device_name = AudioManagerBase::kCommunicationsDeviceName;
+ name.device_name = GetCommunicationsDeviceName();
name.unique_id = AudioManagerBase::kCommunicationsDeviceId;
device_names->push_front(name);
}
// Always add default device parameters as first element.
- name.device_name = AudioManagerBase::kDefaultDeviceName;
+ name.device_name = GetDefaultDeviceName();
name.unique_id = AudioManagerBase::kDefaultDeviceId;
device_names->push_front(name);
}
@@ -339,6 +342,10 @@ std::string AudioManagerWin::GetAssociatedOutputDeviceID(
return CoreAudioUtil::GetMatchingOutputDeviceID(input_device_id);
}
+std::string AudioManagerWin::GetCommunicationsDeviceName() const {
+ return l10n_util::GetStringUTF8(IDS_COMMUNICATIONS_AUDIO_DEVICE_NAME);
+}
+
// Factory for the implementations of AudioOutputStream for AUDIO_PCM_LINEAR
// mode.
// - PCMWaveOutAudioOutputStream: Based on the waveOut API.

Powered by Google App Engine
This is Rietveld 408576698