Revert 130180 - Move media/audio files into media namespace

media/audio/linux/alsa_util.cc

Index: media/audio/linux/alsa_util.cc
===================================================================
--- media/audio/linux/alsa_util.cc	(revision 130181)
+++ media/audio/linux/alsa_util.cc	(working copy)
@@ -11,7 +11,7 @@
 
 namespace alsa_util {
 
-static snd_pcm_t* OpenDevice(media::AlsaWrapper* wrapper,
+static snd_pcm_t* OpenDevice(AlsaWrapper* wrapper,
                              const char* device_name,
                              snd_pcm_stream_t type,
                              int channels,
@@ -81,7 +81,7 @@
   }
 }
 
-int CloseDevice(media::AlsaWrapper* wrapper, snd_pcm_t* handle) {
+int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle) {
   std::string device_name = wrapper->PcmName(handle);
   int error = wrapper->PcmClose(handle);
   if (error < 0) {
@@ -92,7 +92,7 @@
   return error;
 }
 
-snd_pcm_t* OpenCaptureDevice(media::AlsaWrapper* wrapper,
+snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
                              const char* device_name,
                              int channels,
                              int sample_rate,
@@ -102,7 +102,7 @@
                     sample_rate, pcm_format, latency_us);
 }
 
-snd_pcm_t* OpenPlaybackDevice(media::AlsaWrapper* wrapper,
+snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
                               const char* device_name,
                               int channels,
                               int sample_rate,
@@ -112,7 +112,7 @@
                     sample_rate, pcm_format, latency_us);
 }
 
-snd_mixer_t* OpenMixer(media::AlsaWrapper* wrapper,
+snd_mixer_t* OpenMixer(AlsaWrapper* wrapper,
                        const std::string& device_name) {
   snd_mixer_t* mixer = NULL;
 
@@ -143,7 +143,7 @@
   return mixer;
 }
 
-void CloseMixer(media::AlsaWrapper* wrapper, snd_mixer_t* mixer,
+void CloseMixer(AlsaWrapper* wrapper, snd_mixer_t* mixer,
                 const std::string& device_name) {
   if (!mixer)
     return;
@@ -166,7 +166,7 @@
   }
 }
 
-snd_mixer_elem_t* LoadCaptureMixerElement(media::AlsaWrapper* wrapper,
+snd_mixer_elem_t* LoadCaptureMixerElement(AlsaWrapper* wrapper,
                                           snd_mixer_t* mixer) {
   if (!mixer)
     return NULL;