Fixed OpenBSD build.

Compilation on OpenBSD was broken by previous commits in the audio code.

BUG=None
TEST=None

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

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

2 files changed, 7 insertions, 33 deletions

diff --git a/media/audio/openbsd/audio_manager_openbsd.cc b/media/audio/openbsd/audio_manager_openbsd.cc
index c2c7b98..251a085 100644
--- a/media/audio/openbsd/audio_manager_openbsd.cc
+++ b/media/audio/openbsd/audio_manager_openbsd.cc
@@ -21,21 +21,15 @@ bool AudioManagerOpenBSD::HasAudioInputDevices() {
   return false;
 }
 
-AudioInputStream* AudioManagerOpenBSD::MakeAudioInputStream(
-    Format format,
-    int channels,
-    int sample_rate,
-    char bits_per_sample,
-    uint32 samples_per_packet) {
+AudioOutputStream* AudioManagerOpenBSD::MakeAudioOutputStream(
+    AudioParameters params) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-AudioOutputStream* AudioManagerOpenBSD::MakeAudioOutputStream(
-    Format format,
-    int channels,
-    int sample_rate,
-    char bits_per_sample) {
+AudioInputStream* AudioManagerOpenBSD::MakeAudioInputStream(
+    AudioParameters params,
+    uint32 samples_per_packet) {
   NOTIMPLEMENTED();
   return NULL;
 }
@@ -58,20 +52,6 @@ void AudioManagerOpenBSD::UnMuteAll() {
   NOTIMPLEMENTED();
 }
 
-void DestroyAudioManagerOpenBSD(void* not_used) {
-  delete g_audio_manager;
-  g_audio_manager = NULL;
-}
-
-AudioManager* AudioManager::GetAudioManager() {
-  if (!g_audio_manager) {
-    g_audio_manager = new AudioManagerOpenBSD();
-    g_audio_manager->Init();
-    base::AtExitManager::RegisterCallback(&DestroyAudioManagerOpenBSD, NULL);
-  }
-  return g_audio_manager;
-}
-
 // static
 AudioManager* AudioManager::CreateAudioManager() {
   return new AudioManagerOpenBSD();
diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h
index fc35a37..c643cdd 100644
--- a/media/audio/openbsd/audio_manager_openbsd.h
+++ b/media/audio/openbsd/audio_manager_openbsd.h
@@ -17,19 +17,13 @@ class AudioManagerOpenBSD : public AudioManagerBase {
   // Implementation of AudioManager.
   virtual bool HasAudioOutputDevices();
   virtual bool HasAudioInputDevices();
-  virtual AudioOutputStream* MakeAudioOutputStream(Format format, int channels,
-                                                   int sample_rate,
-                                                   char bits_per_sample);
-  virtual AudioInputStream* MakeAudioInputStream(Format format, int channels,
-                                                 int sample_rate,
-                                                 char bits_per_sample,
+  virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params);
+  virtual AudioInputStream* MakeAudioInputStream(AudioParameters params,
                                                  uint32 samples_per_packet);
   virtual void MuteAll();
   virtual void UnMuteAll();
 
  protected:
-  // Friend function for invoking the destructor at exit.
-  friend void DestroyAudioManagerOpenBSD(void*);
   virtual ~AudioManagerOpenBSD();
 
  private: