diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-21 02:50:38 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-21 02:50:38 +0000 |
commit | 938ecf4550bd9011cf006a1f0239b3c786304bac (patch) | |
tree | 423a1f648dd14f734705ea76a2f908a5ea00f289 /media/audio/mac/audio_manager_mac.cc | |
parent | c137292f1790329b838e857135dac7fe80f504cf (diff) | |
download | chromium_src-938ecf4550bd9011cf006a1f0239b3c786304bac.zip chromium_src-938ecf4550bd9011cf006a1f0239b3c786304bac.tar.gz chromium_src-938ecf4550bd9011cf006a1f0239b3c786304bac.tar.bz2 |
Revert r21137 to fix Chromium mac valgrind
TBR=scherkus
Review URL: http://codereview.chromium.org/159122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/mac/audio_manager_mac.cc')
-rw-r--r-- | media/audio/mac/audio_manager_mac.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index a921dfb..7a8e15b 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -5,7 +5,6 @@ #include <CoreAudio/AudioHardware.h> #include "base/at_exit.h" -#include "media/audio/fake_audio_output_stream.h" #include "media/audio/mac/audio_manager_mac.h" #include "media/audio/mac/audio_output_mac.h" @@ -20,9 +19,8 @@ bool AudioManagerMac::HasAudioDevices() { AudioOutputStream* AudioManagerMac::MakeAudioStream(Format format, int channels, int sample_rate, char bits_per_sample) { - if (format == AUDIO_MOCK) - return FakeAudioOutputStream::MakeFakeStream(); - else if (format != AUDIO_PCM_LINEAR) + // TODO(cpu): add mock format. + if (format != AUDIO_PCM_LINEAR) return NULL; return new PCMQueueOutAudioOutputStream(this, channels, sample_rate, bits_per_sample); @@ -36,15 +34,19 @@ void AudioManagerMac::UnMuteAll() { // TODO(cpu): implement. } +const void* AudioManagerMac::GetLastMockBuffer() { + // TODO(cpu): implement. + return NULL; +} + // Called by the stream when it has been released by calling Close(). void AudioManagerMac::ReleaseStream(PCMQueueOutAudioOutputStream* stream) { delete stream; } namespace { - -AudioManagerMac* g_audio_manager = NULL; - + AudioManagerMac* g_audio_manager = NULL; + } // namespace. void DestroyAudioManagerMac(void* param) { |