Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(953)

Unified Diff: media/audio/linux/audio_manager_linux.cc

Issue 10952024: Adding pulseaudio input support to chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved the pulse code to AudioManagerPulse, and addressed Dale's comments. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ff6cbbd088934aa8c9fd87aef6f9db6c029f9ba3..c2fa6fc36ae06d4b538c8e6597adb6a69f80eff6 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"
@@ -303,12 +303,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)) {
@@ -337,6 +331,11 @@ AudioInputStream* AudioManagerLinux::MakeInputStream(
}
AudioManager* CreateAudioManager() {
+#if defined(USE_PULSEAUDIO)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio))
+ return AudioManagerPulse::Create();
+ #endif
+
return new AudioManagerLinux();
}

Powered by Google App Engine
This is Rietveld 408576698