| Index: media/audio/linux/audio_manager_linux.cc
|
| diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
|
| index 69e8b9bdad5facec9a0633e773ad80a62f55a068..a9d299fe8a9c2035f240efeaf0e200ac66d677a7 100644
|
| --- a/media/audio/linux/audio_manager_linux.cc
|
| +++ b/media/audio/linux/audio_manager_linux.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/at_exit.h"
|
| #include "base/logging.h"
|
| +#include "media/audio/fake_audio_output_stream.h"
|
| #include "media/audio/linux/alsa_output.h"
|
|
|
| namespace {
|
| @@ -27,11 +28,15 @@ AudioOutputStream* AudioManagerLinux::MakeAudioStream(Format format,
|
| // 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;
|
| + if (format == AudioManager::AUDIO_MOCK) {
|
| + return FakeAudioOutputStream::MakeFakeStream();
|
| + } else {
|
| + AlsaPCMOutputStream* stream =
|
| + new AlsaPCMOutputStream(AlsaPCMOutputStream::kDefaultDevice,
|
| + 100 /* 100ms minimal buffer */,
|
| + format, channels, sample_rate, bits_per_sample);
|
| + return stream;
|
| + }
|
| }
|
|
|
| AudioManagerLinux::AudioManagerLinux() {
|
| @@ -50,12 +55,6 @@ void AudioManagerLinux::UnMuteAll() {
|
| 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;
|
|
|