Chromium Code Reviews| 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 8cf8355da3c668ac4e45c7f957f4b9370d8077c4..f1bba6c292042f6c21b58a897bfc85d1ed0fcb1b 100644 |
| --- a/media/audio/linux/audio_manager_linux.cc |
| +++ b/media/audio/linux/audio_manager_linux.cc |
| @@ -19,9 +19,7 @@ |
| #include "media/audio/linux/alsa_input.h" |
| #include "media/audio/linux/alsa_output.h" |
| #include "media/audio/linux/alsa_wrapper.h" |
| -#if defined(USE_PULSEAUDIO) |
| #include "media/audio/pulse/audio_manager_pulse.h" |
| -#endif |
| #include "media/base/channel_layout.h" |
| #include "media/base/limits.h" |
| #include "media/base/media_switches.h" |
| @@ -325,13 +323,9 @@ AudioManager* CreateAudioManager() { |
| } |
| #endif |
| -#if defined(USE_PULSEAUDIO) |
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) { |
| - AudioManager* manager = AudioManagerPulse::Create(); |
| - if (manager) |
| - return manager; |
| - } |
| -#endif |
| + AudioManager* manager = AudioManagerPulse::Create(); |
|
DaleCurtis
2013/03/11 22:06:46
fischman had a great suggestion: You should add a
no longer working on chromium
2013/03/12 16:08:29
Done.
|
| + if (manager) |
| + return manager; |
| return new AudioManagerLinux(); |
| } |