diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 06:00:33 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 06:00:33 +0000 |
| commit | 8117a12e805a3243141cf3c7cb0f2cdd0538b47f (patch) | |
| tree | 77ca52f1d5086608d87064fa4e500d793b528fb5 /media/audio/pulse | |
| parent | 0a72447fb90b7d8ab0ab07119098a46ba84f0c86 (diff) | |
| download | chromium_src-8117a12e805a3243141cf3c7cb0f2cdd0538b47f.zip chromium_src-8117a12e805a3243141cf3c7cb0f2cdd0538b47f.tar.gz chromium_src-8117a12e805a3243141cf3c7cb0f2cdd0538b47f.tar.bz2 | |
Support use_alsa==0 on Linux
This moves the ALSA audio code from media/audio/linux to
media/audio/alsa and splits Linux's CreateAudioManager() into a new
file. This function chooses which AudioManager subclass to use on Linux.
When use_alsa==0 on Linux, the fallback audio manager is changed from
ALSA to a new fake implementation that always has an empty set of devices
and will only return fake streams.
This allows us to compile with no audio support on Linux. In particular,
we can compile for targets that don't have the ALSA libraries available.
Obviously, it's not (yet) possible to play audio in this configuration.
BUG=318315, 318413
Review URL: https://codereview.chromium.org/89793003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/pulse')
| -rw-r--r-- | media/audio/pulse/audio_manager_pulse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc index 4aac9c5..c5b78d7 100644 --- a/media/audio/pulse/audio_manager_pulse.cc +++ b/media/audio/pulse/audio_manager_pulse.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/nix/xdg_util.h" #include "base/stl_util.h" +#include "media/audio/alsa/audio_manager_alsa.h" #include "media/audio/audio_parameters.h" -#include "media/audio/linux/audio_manager_linux.h" #include "media/audio/pulse/pulse_input.h" #include "media/audio/pulse/pulse_output.h" #include "media/audio/pulse/pulse_unified.h" @@ -77,7 +77,7 @@ bool AudioManagerPulse::HasAudioInputDevices() { } void AudioManagerPulse::ShowAudioInputSettings() { - AudioManagerLinux::ShowLinuxAudioInputSettings(); + AudioManagerAlsa::ShowLinuxAudioInputSettings(); } void AudioManagerPulse::GetAudioDeviceNames( |