Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

media/audio/pulse/audio_manager_pulse.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/pulse/audio_manager_pulse.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/stl_util.h"
 #if defined(USE_ALSA)
 #include "media/audio/alsa/audio_manager_alsa.h"
 #endif
+#include "media/audio/audio_device_description.h"
 #include "media/audio/pulse/pulse_input.h"
 #include "media/audio/pulse/pulse_output.h"
 #include "media/audio/pulse/pulse_util.h"
 #include "media/base/audio_parameters.h"
 #include "media/base/channel_layout.h"
 
 #if defined(DLOPEN_PULSEAUDIO)
 #include "media/audio/pulse/pulse_stubs.h"
 
 using media_audio_pulse::kModulePulse;
@@ skipping 81 matching lines @@
   if (input) {
     operation = pa_context_get_source_info_list(
       input_context_, InputDevicesInfoCallback, this);
   } else {
     operation = pa_context_get_sink_info_list(
         input_context_, OutputDevicesInfoCallback, this);
   }
   WaitForOperationCompletion(input_mainloop_, operation);
 
   // Prepend the default device if the list is not empty.
-  if (!device_names->empty()) {
-    device_names->push_front(
-        AudioDeviceName(AudioManager::GetDefaultDeviceName(),
-                        AudioManagerBase::kDefaultDeviceId));
-  }
+  if (!device_names->empty())
+    device_names->push_front(AudioDeviceName::CreateDefault());
 }
 
 void AudioManagerPulse::GetAudioInputDeviceNames(
     AudioDeviceNames* device_names) {
   GetAudioDeviceNames(true, device_names);
 }
 
 void AudioManagerPulse::GetAudioOutputDeviceNames(
     AudioDeviceNames* device_names) {
   GetAudioDeviceNames(false, device_names);
 }
 
 AudioParameters AudioManagerPulse::GetInputStreamParameters(
     const std::string& device_id) {
   int user_buffer_size = GetUserBufferSize();
   int buffer_size = user_buffer_size ?
       user_buffer_size : kDefaultInputBufferSize;
 
   // TODO(xians): add support for querying native channel layout for pulse.
   return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
                          CHANNEL_LAYOUT_STEREO, GetNativeSampleRate(), 16,
                          buffer_size);
 }
 
 AudioOutputStream* AudioManagerPulse::MakeLinearOutputStream(
     const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-  return MakeOutputStream(params, AudioManagerBase::kDefaultDeviceId);
+  return MakeOutputStream(params, AudioDeviceDescription::kDefaultDeviceId);
 }
 
 AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream(
     const AudioParameters& params,
     const std::string& device_id) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
-  return MakeOutputStream(
-      params,
-      device_id.empty() ? AudioManagerBase::kDefaultDeviceId : device_id);
+  return MakeOutputStream(params, device_id.empty()
+                                      ? AudioDeviceDescription::kDefaultDeviceId
+                                      : device_id);
 }
 
 AudioInputStream* AudioManagerPulse::MakeLinearInputStream(
     const AudioParameters& params, const std::string& device_id) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return MakeInputStream(params, device_id);
 }
 
 AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream(
     const AudioParameters& params, const std::string& device_id) {
@@ skipping 166 matching lines @@
 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context,
                                                const pa_server_info* info,
                                                void* user_data) {
   AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data);
 
   manager->native_input_sample_rate_ = info->sample_spec.rate;
   pa_threaded_mainloop_signal(manager->input_mainloop_, 0);
 }
 
 }  // namespace media