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

media/audio/alsa/audio_manager_alsa.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/alsa/audio_manager_alsa.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/free_deleter.h"
 #include "base/metrics/histogram.h"
 #include "base/nix/xdg_util.h"
 #include "base/process/launch.h"
 #include "base/stl_util.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_output_dispatcher.h"
 #if defined(USE_CRAS)
 #include "media/audio/cras/audio_manager_cras.h"
 #endif
 #include "media/audio/alsa/alsa_input.h"
 #include "media/audio/alsa/alsa_output.h"
 #include "media/audio/alsa/alsa_wrapper.h"
 #if defined(USE_PULSEAUDIO)
 #include "media/audio/pulse/audio_manager_pulse.h"
 #endif
@@ skipping 136 matching lines @@
     std::unique_ptr<char, base::FreeDeleter> io(
         wrapper_->DeviceNameGetHint(*hint_iter, kIoHintName));
     if (io != NULL && strcmp(unwanted_device_type, io.get()) == 0)
       continue;
 
     // Found a device, prepend the default device since we always want
     // it to be on the top of the list for all platforms. And there is
     // no duplicate counting here since it is only done if the list is
     // still empty.  Note, pulse has exclusively opened the default
     // device, so we must open the device via the "default" moniker.
-    if (device_names->empty()) {
-      device_names->push_front(
-          media::AudioDeviceName(AudioManager::GetDefaultDeviceName(),
-                                 AudioManagerBase::kDefaultDeviceId));
-    }
+    if (device_names->empty())
+      device_names->push_front(media::AudioDeviceName::CreateDefault());
 
     // Get the unique device name for the device.
     std::unique_ptr<char, base::FreeDeleter> unique_device_name(
         wrapper_->DeviceNameGetHint(*hint_iter, kNameHintName));
 
     // Find out if the device is available.
     if (IsAlsaDeviceAvailable(type, unique_device_name.get())) {
       // Get the description for the device.
       std::unique_ptr<char, base::FreeDeleter> desc(
           wrapper_->DeviceNameGetHint(*hint_iter, kDescriptionHintName));
@@ skipping 157 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAlsaOutputDevice)) {
     device_name = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaOutputDevice);
   }
   return new AlsaPcmOutputStream(device_name, params, wrapper_.get(), this);
 }
 
 AudioInputStream* AudioManagerAlsa::MakeInputStream(
     const AudioParameters& params, const std::string& device_id) {
-  std::string device_name = (device_id == AudioManagerBase::kDefaultDeviceId) ?
-      AlsaPcmInputStream::kAutoSelectDevice : device_id;
+  std::string device_name =
+      (device_id == AudioDeviceDescription::kDefaultDeviceId)
+          ? AlsaPcmInputStream::kAutoSelectDevice
+          : device_id;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAlsaInputDevice)) {
     device_name = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaInputDevice);
   }
 
   return new AlsaPcmInputStream(this, device_name, params, wrapper_.get());
 }
 
 }  // namespace media