Add localized default audio device names.

media/audio/cras/audio_manager_cras.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/cras/audio_manager_cras.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/stl_util.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 "media/base/media_resources.h"
 
 // cras_util.h headers pull in min/max macros...
 // TODO(dgreid): Fix headers such that these aren't imported.
 #undef min
 #undef max
 
 namespace media {
 namespace {
 
 // Maximum number of output streams that can be open simultaneously.
 const int kMaxOutputStreams = 50;
 
 // Default sample rate for input and output streams.
 const int kDefaultSampleRate = 48000;
 
 // Define bounds for the output buffer size.
 const int kMinimumOutputBufferSize = 512;
 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));
+  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
 // internal mic and otherwise an empty string.
 std::string MicPositions() {
   // Get the list of devices from CRAS. An internal mic with a non-empty
   // positions field indicates the machine has a beamforming capable mic array.
   chromeos::AudioDeviceList devices;
   chromeos::CrasAudioHandler::Get()->GetAudioDevices(&devices);
   for (const auto& device : devices) {
@@ skipping 17 matching lines @@
   for (size_t i = 0; i < devices.size(); ++i) {
     if (devices[i].is_input && devices[i].is_for_simple_usage())
       return true;
   }
   return false;
 }
 
 AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory)
     : AudioManagerBase(audio_log_factory),
       has_keyboard_mic_(false),
       beamforming_on_device_name_(BeamformingOnDeviceName()),

[ajm, 2015/09/18 00:43:21]

Initializing these at construction was too early and ended up in empty strings.

Instead I now have static defaults for the ID strings (there was really no
reason they had to depend on the default ID) and query the names in
GetAudioInputDeviceNames. This is consistent with the default device handling.

       beamforming_off_device_name_(BeamformingOffDeviceName()) {
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 }
 
 AudioManagerCras::~AudioManagerCras() {
   Shutdown();
 }
 
 void AudioManagerCras::ShowAudioInputSettings() {
   NOTIMPLEMENTED();
@@ skipping 119 matching lines @@
     case 24:
       return SND_PCM_FORMAT_S24;
     case 32:
       return SND_PCM_FORMAT_S32;
     default:
       return SND_PCM_FORMAT_UNKNOWN;
   }
 }
 
 }  // namespace media