| 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..587d0712fa8699976340f443eacbdcbacb115787 100644
|
| --- a/media/audio/cras/audio_manager_cras.cc
|
| +++ b/media/audio/cras/audio_manager_cras.cc
|
| @@ -11,11 +11,14 @@
|
| #include "base/logging.h"
|
| #include "base/nix/xdg_util.h"
|
| #include "base/stl_util.h"
|
| +#include "chrome/grit/chromium_strings.h"
|
| +#include "chrome/grit/generated_resources.h"
|
| #include "chromeos/audio/audio_device.h"
|
| #include "chromeos/audio/cras_audio_handler.h"
|
| #include "media/audio/cras/cras_input.h"
|
| #include "media/audio/cras/cras_unified.h"
|
| #include "media/base/channel_layout.h"
|
| +#include "ui/base/l10n/l10n_util.h"
|
|
|
| // cras_util.h headers pull in min/max macros...
|
| // TODO(dgreid): Fix headers such that these aren't imported.
|
| @@ -38,32 +41,21 @@ const int kMaximumOutputBufferSize = 8192;
|
| // Default input buffer size.
|
| 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));
|
| -}
|
| -
|
| // 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,
|
| + l10n_util::GetStringUTF8(
|
| + IDS_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(
|
| + l10n_util::GetStringUTF8(
|
| + IDS_BEAMFORMING_OFF_DEFAULT_AUDIO_INPUT_DEVICE_NAME),
|
| + AudioManagerBase::kDefaultDeviceId);
|
| }
|
|
|
| // Returns a mic positions string if the machine has a beamforming capable
|
| @@ -84,6 +76,12 @@ std::string MicPositions() {
|
|
|
| } // namespace
|
|
|
| +void AudioManagerCras::AddDefaultDevice(AudioDeviceNames* device_names) const {
|
| + // Cras will route audio from a proper physical device automatically.
|
| + device_names->push_back(AudioDeviceName(GetDefaultDeviceName(),
|
| + AudioManagerBase::kDefaultDeviceId));
|
| +}
|
| +
|
| bool AudioManagerCras::HasAudioOutputDevices() {
|
| return true;
|
| }
|
|
|