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

media/audio/pulse/pulse_util.cc

 // Copyright (c) 2012 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/pulse_util.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/time/time.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_device_description.h"
 #include "media/base/audio_parameters.h"
 
 namespace media {
 
 namespace pulse {
 
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
 static const char kBrowserDisplayName[] = "google-chrome";
@@ skipping 140 matching lines @@
 
 bool CreateInputStream(pa_threaded_mainloop* mainloop,
                        pa_context* context,
                        pa_stream** stream,
                        const AudioParameters& params,
                        const std::string& device_id,
                        pa_stream_notify_cb_t stream_callback,
                        void* user_data) {
   DCHECK(mainloop);
   DCHECK(context);
-  DCHECK_NE(device_id, AudioManagerBase::kDefaultDeviceId);
+  DCHECK_NE(device_id, AudioDeviceDescription::kDefaultDeviceId);
 
   // Set sample specifications.
   pa_sample_spec sample_specifications;
   sample_specifications.format = BitsToPASampleFormat(
       params.bits_per_sample());
   sample_specifications.rate = params.sample_rate();
   sample_specifications.channels = params.channels();
 
   // Get channel mapping and open recording stream.
   pa_channel_map source_channel_map = ChannelLayoutToPAChannelMap(
@@ skipping 49 matching lines @@
                         pa_context* context,
                         pa_stream** stream,
                         const AudioParameters& params,
                         const std::string& device_id,
                         const std::string& app_name,
                         pa_stream_notify_cb_t stream_callback,
                         pa_stream_request_cb_t write_callback,
                         void* user_data) {
   DCHECK(mainloop);
   DCHECK(context);
-  DCHECK(device_id != AudioManagerBase::kDefaultDeviceId);
+  DCHECK(device_id != AudioDeviceDescription::kDefaultDeviceId);
 
   // Set sample specifications.
   pa_sample_spec sample_specifications;
   sample_specifications.format = BitsToPASampleFormat(
       params.bits_per_sample());
   sample_specifications.rate = params.sample_rate();
   sample_specifications.channels = params.channels();
 
   // Get channel mapping.
   pa_channel_map* map = NULL;
@@ skipping 61 matching lines @@
   }
 
   return true;
 }
 
 #undef RETURN_ON_FAILURE
 
 }  // namespace pulse
 
 }  // namespace media