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 3387d56d2872e6ec507e1fdb2fb9edda6a04c827..9a4894b691ca2e9aca26a46653abf211d0aa6fd6 100644 |
--- a/media/audio/linux/audio_manager_linux.cc |
+++ b/media/audio/linux/audio_manager_linux.cc |
@@ -16,7 +16,7 @@ |
#include "media/audio/linux/alsa_output.h" |
#include "media/audio/linux/alsa_wrapper.h" |
#if defined(USE_PULSEAUDIO) |
-#include "media/audio/pulse/pulse_output.h" |
+#include "media/audio/pulse/audio_manager_pulse.h" |
#endif |
#if defined(USE_CRAS) |
#include "media/audio/linux/cras_input.h" |
@@ -285,12 +285,6 @@ AudioOutputStream* AudioManagerLinux::MakeOutputStream( |
} |
#endif |
-#if defined(USE_PULSEAUDIO) |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) { |
- return new PulseAudioOutputStream(params, this); |
- } |
-#endif |
- |
std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice; |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kAlsaOutputDevice)) { |
@@ -319,6 +313,14 @@ AudioInputStream* AudioManagerLinux::MakeInputStream( |
} |
AudioManager* CreateAudioManager() { |
+#if defined(USE_PULSEAUDIO) |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) { |
+ AudioManager* manager = AudioManagerPulse::Create(); |
+ if (manager) |
+ return manager; |
+ } |
+#endif |
+ |
return new AudioManagerLinux(); |
} |