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

media/audio/win/wavein_input_win.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/win/wavein_input_win.h"
 
 #include "base/logging.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/win/audio_manager_win.h"
 #include "media/audio/win/device_enumeration_win.h"
 #include "media/base/audio_bus.h"
 
 namespace media {
 
 // Our sound buffers are allocated once and kept in a linked list using the
 // the WAVEHDR::dwUser variable. The last buffer points to the first buffer.
 static WAVEHDR* GetNextBuffer(WAVEHDR* current) {
@@ skipping 220 matching lines @@
 
 void PCMWaveInAudioInputStream::QueueNextPacket(WAVEHDR *buffer) {
   MMRESULT res = ::waveInAddBuffer(wavein_, buffer, sizeof(WAVEHDR));
   if (res != MMSYSERR_NOERROR)
     HandleError(res);
 }
 
 bool PCMWaveInAudioInputStream::GetDeviceId(UINT* device_index) {
   // Deliver the default input device id (WAVE_MAPPER) if the default
   // device has been selected.
-  if (device_id_ == AudioManagerBase::kDefaultDeviceId) {
+  if (device_id_ == AudioDeviceDescription::kDefaultDeviceId) {
     *device_index = WAVE_MAPPER;
     return true;
   }
 
   // Get list of all available and active devices.
   AudioDeviceNames device_names;
   if (!media::GetInputDeviceNamesWinXP(&device_names))
     return false;
 
   if (device_names.empty())
@@ skipping 56 matching lines @@
       ::SetEvent(obj->stopped_event_.Get());
     }
   } else if (msg == WIM_CLOSE) {
     // Intentionaly no-op for now.
   } else if (msg == WIM_OPEN) {
     // Intentionaly no-op for now.
   }
 }
 
 }  // namespace media