| Index: media/audio/cras/audio_manager_cras.cc
|
| diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc
|
| index 2b47de40cc9f7d04c9525000bdc3ba2a32efa2c7..f4275ddd4fda3cf64f8cc86b2e5841472a44a462 100644
|
| --- a/media/audio/cras/audio_manager_cras.cc
|
| +++ b/media/audio/cras/audio_manager_cras.cc
|
| @@ -16,6 +16,7 @@
|
| #include "media/audio/cras/cras_input.h"
|
| #include "media/audio/cras/cras_unified.h"
|
| #include "media/base/channel_layout.h"
|
| +#include "media/base/media_resources.h"
|
|
|
| // cras_util.h headers pull in min/max macros...
|
| // TODO(dgreid): Fix headers such that these aren't imported.
|
| @@ -40,30 +41,23 @@ const int kDefaultInputBufferSize = 1024;
|
|
|
| void AddDefaultDevice(AudioDeviceNames* device_names) {
|
| // Cras will route audio from a proper physical device automatically.
|
| - device_names->push_back(
|
| - AudioDeviceName(AudioManagerBase::kDefaultDeviceName,
|
| - AudioManagerBase::kDefaultDeviceId));
|
| + device_names->push_back(AudioDeviceName(AudioManager::GetDefaultDeviceName(),
|
| + AudioManagerBase::kDefaultDeviceId));
|
| }
|
|
|
| // Returns the AudioDeviceName of the virtual device with beamforming on.
|
| AudioDeviceName BeamformingOnDeviceName() {
|
| - // TODO(ajm): Replace these strings with properly localized ones.
|
| - // (crbug.com/497001)
|
| - static const char kBeamformingOnNameSuffix[] = " (pick up just one person)";
|
| static const char kBeamformingOnIdSuffix[] = "-beamforming";
|
| -
|
| return AudioDeviceName(
|
| - std::string(AudioManagerBase::kDefaultDeviceName) +
|
| - kBeamformingOnNameSuffix,
|
| + GetLocalizedStringUTF8(BEAMFORMING_ON_DEFAULT_AUDIO_INPUT_DEVICE_NAME),
|
| std::string(AudioManagerBase::kDefaultDeviceId) + kBeamformingOnIdSuffix);
|
| }
|
|
|
| // Returns the AudioDeviceName of the virtual device with beamforming off.
|
| AudioDeviceName BeamformingOffDeviceName() {
|
| - static const char kBeamformingOffNameSuffix[] = " (pick up everything)";
|
| - return AudioDeviceName(std::string(AudioManagerBase::kDefaultDeviceName) +
|
| - kBeamformingOffNameSuffix,
|
| - AudioManagerBase::kDefaultDeviceId);
|
| + return AudioDeviceName(
|
| + GetLocalizedStringUTF8(BEAMFORMING_OFF_DEFAULT_AUDIO_INPUT_DEVICE_NAME),
|
| + AudioManagerBase::kDefaultDeviceId);
|
| }
|
|
|
| // Returns a mic positions string if the machine has a beamforming capable
|
|
|