diff options
Diffstat (limited to 'media/audio/linux/audio_manager_linux.cc')
-rw-r--r-- | media/audio/linux/audio_manager_linux.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc index 02118af..8cf8355 100644 --- a/media/audio/linux/audio_manager_linux.cc +++ b/media/audio/linux/audio_manager_linux.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "base/environment.h" #include "base/logging.h" -#include "base/metrics/histogram.h" #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/stl_util.h" @@ -20,7 +19,9 @@ #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" @@ -45,13 +46,6 @@ static const char* kInvalidAudioInputDevices[] = { "surround", }; -enum LinuxAudioIO { - kPulse, - kAlsa, - kCras, - kAudioIOMax // Must always be last! -}; - // static void AudioManagerLinux::ShowLinuxAudioInputSettings() { scoped_ptr<base::Environment> env(base::Environment::Create()); @@ -327,18 +321,18 @@ AudioInputStream* AudioManagerLinux::MakeInputStream( AudioManager* CreateAudioManager() { #if defined(USE_CRAS) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) { - UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax); return new AudioManagerCras(); } #endif - AudioManager* manager = AudioManagerPulse::Create(); - if (manager) { - UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax); - return manager; +#if defined(USE_PULSEAUDIO) + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) { + AudioManager* manager = AudioManagerPulse::Create(); + if (manager) + return manager; } +#endif - UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kAlsa, kAudioIOMax); return new AudioManagerLinux(); } |