Implement GetAudioOutputDeviceNames for Cras.

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 "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/stl_util.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/cras/cras_input.h"
 #include "media/audio/cras/cras_unified.h"
 #include "media/base/channel_layout.h"
 
 namespace media {
 
+namespace {

[tfarina, 2013/09/15 03:17:45]

minor-question: hasn't media folks decided to use static over unnamed
namespaces?

[Jói, 2013/09/16 08:56:45]

Not that I know of. Tommi?

[tommi (sloooow) - chröme, 2013/09/16 10:47:41]

Yes, that's correct.

+
+void AddDefaultDevice(media::AudioDeviceNames* device_names) {

[tfarina, 2013/09/15 03:17:45]

micro-style-nit: no media:: here.

[Jói, 2013/09/16 08:56:45]

Addressed, although not here (this patch is closed) but in
https://codereview.chromium.org/23475037/ which consolidates this.

+  DCHECK(device_names->empty());
+
+  // Cras will route audio from a proper physical device automatically.
+  device_names->push_back(
+      AudioDeviceName(AudioManagerBase::kDefaultDeviceName,
+                      AudioManagerBase::kDefaultDeviceId));
+}
+
+}  // namespace
+
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 50;
 
 // Default sample rate for input and output streams.
 static const int kDefaultSampleRate = 48000;
 
 const char AudioManagerCras::kLoopbackDeviceId[] = "loopback";
 
 bool AudioManagerCras::HasAudioOutputDevices() {
   return true;
@@ skipping 10 matching lines @@
 AudioManagerCras::~AudioManagerCras() {
   Shutdown();
 }
 
 void AudioManagerCras::ShowAudioInputSettings() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerCras::GetAudioInputDeviceNames(
     media::AudioDeviceNames* device_names) {
-  DCHECK(device_names->empty());
-  GetCrasAudioInputDevices(device_names);
-  return;
+  AddDefaultDevice(device_names);
+}
+
+void AudioManagerCras::GetAudioOutputDeviceNames(
+    media::AudioDeviceNames* device_names) {
+  AddDefaultDevice(device_names);
 }
 
 AudioParameters AudioManagerCras::GetInputStreamParameters(
     const std::string& device_id) {
   static const int kDefaultInputBufferSize = 1024;
   // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal
   // parameters for the loopback stream may differ from the default.
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
       kDefaultSampleRate, 16, kDefaultInputBufferSize);
 }
 
-void AudioManagerCras::GetCrasAudioInputDevices(
-    media::AudioDeviceNames* device_names) {
-  // Cras will route audio from a proper physical device automatically.
-  device_names->push_back(
-      AudioDeviceName(AudioManagerBase::kDefaultDeviceName,
-                      AudioManagerBase::kDefaultDeviceId));
-}
-
 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return MakeOutputStream(params);
 }
 
 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream(
     const AudioParameters& params,
     const std::string& device_id,
     const std::string& input_device_id) {
@@ skipping 48 matching lines @@
     const AudioParameters& params) {
   return new CrasUnifiedStream(params, this);
 }
 
 AudioInputStream* AudioManagerCras::MakeInputStream(
     const AudioParameters& params, const std::string& device_id) {
   return new CrasInputStream(params, this, device_id);
 }
 
 }  // namespace media