diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 16:12:54 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 16:12:54 +0000 |
commit | ab343b45f8f516be187e44a0cb4e478c53e65029 (patch) | |
tree | 87f547b4ec2fabc2716a9771fdc6a7c4ab544122 /media/audio/pulse | |
parent | 1f0d9cc1b9b89771c21eb3a4fe0010b6fba6164f (diff) | |
download | chromium_src-ab343b45f8f516be187e44a0cb4e478c53e65029.zip chromium_src-ab343b45f8f516be187e44a0cb4e478c53e65029.tar.gz chromium_src-ab343b45f8f516be187e44a0cb4e478c53e65029.tar.bz2 |
Linux: add an option to link pulseaudio directly (DT_NEEDED).
Useful for Linux distros.
BUG=none
Review URL: https://codereview.chromium.org/12634033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/pulse')
-rw-r--r-- | media/audio/pulse/audio_manager_pulse.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc index 2144175..758d227 100644 --- a/media/audio/pulse/audio_manager_pulse.cc +++ b/media/audio/pulse/audio_manager_pulse.cc @@ -16,13 +16,16 @@ #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_stubs.h" #include "media/audio/pulse/pulse_util.h" #include "media/base/channel_layout.h" +#if defined(DLOPEN_PULSEAUDIO) +#include "media/audio/pulse/pulse_stubs.h" + using media_audio_pulse::kModulePulse; using media_audio_pulse::InitializeStubs; using media_audio_pulse::StubPathMap; +#endif // defined(DLOPEN_PULSEAUDIO) namespace media { @@ -178,6 +181,7 @@ int AudioManagerPulse::GetNativeSampleRate() { bool AudioManagerPulse::Init() { DCHECK(!input_mainloop_); +#if defined(DLOPEN_PULSEAUDIO) StubPathMap paths; // Check if the pulse library is avialbale. @@ -186,6 +190,7 @@ bool AudioManagerPulse::Init() { DLOG(WARNING) << "Failed on loading the Pulse library and symbols"; return false; } +#endif // defined(DLOPEN_PULSEAUDIO) // Create a mainloop API and connect to the default server. // The mainloop is the internal asynchronous API event loop. |