Revert http://codereview.chromium.org/115276

Review URL: http://codereview.chromium.org/115624

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16584 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 64 deletions

diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index afe1c3c..15a13b2 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -2,70 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/audio/linux/audio_manager_linux.h"
-
-#include "base/at_exit.h"
-#include "base/logging.h"
-#include "media/audio/linux/alsa_output.h"
-
-namespace {
-AudioManagerLinux* g_audio_manager = NULL;
-}  // namespace
-
-// Implementation of AudioManager.
-bool AudioManagerLinux::HasAudioDevices() {
-  // TODO(ajwong): Make this actually query audio devices.
-  return true;
-}
-
-AudioOutputStream* AudioManagerLinux::MakeAudioStream(Format format,
-                                                      int channels,
-                                                      int sample_rate,
-                                                      char bits_per_sample) {
-  // TODO(ajwong): Do we want to be able to configure the device? plug:default
-  // should work correctly for all mono/stereo, but not surround, which needs
-  // surround40, surround51, etc.
-  //
-  // http://0pointer.de/blog/projects/guide-to-sound-apis.html
-  AlsaPCMOutputStream* stream =
-      new AlsaPCMOutputStream(AlsaPCMOutputStream::kDefaultDevice,
-                              100 /* 100ms minimal buffer */,
-                              format, channels, sample_rate, bits_per_sample);
-  return stream;
-}
-
-AudioManagerLinux::AudioManagerLinux() {
-}
-
-AudioManagerLinux::~AudioManagerLinux() {
-}
-
-void AudioManagerLinux::MuteAll() {
-  // TODO(ajwong): Implement.
-  NOTIMPLEMENTED();
-}
-
-void AudioManagerLinux::UnMuteAll() {
-  // TODO(ajwong): Implement.
-  NOTIMPLEMENTED();
-}
-
-const void* AudioManagerLinux::GetLastMockBuffer() {
-  // TODO(ajwong): Implement.
-  NOTIMPLEMENTED();
-  return NULL;
-}
-
-// TODO(ajwong): Collapse this with the windows version.
-void DestroyAudioManagerLinux(void* not_used) {
-  delete g_audio_manager;
-  g_audio_manager = NULL;
-}
+#include "media/audio/audio_output.h"
 
+// TODO(hclam): Do something more useful than returning NULL.
 AudioManager* AudioManager::GetAudioManager() {
-  if (!g_audio_manager) {
-    g_audio_manager = new AudioManagerLinux();
-    base::AtExitManager::RegisterCallback(&DestroyAudioManagerLinux, NULL);
-  }
-  return g_audio_manager;
+  return NULL;
 }