diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 22:49:39 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 22:49:39 +0000 |
| commit | a1ced36bfe270857f9e73c19338817be40d86720 (patch) | |
| tree | b46ef6b018746a8ad2f6e4a501c1f4657fe239dd /media/media.gyp | |
| parent | 3ab4c0af18aa95289f7d97da690e112a0cba8c77 (diff) | |
| download | chromium_src-a1ced36bfe270857f9e73c19338817be40d86720.zip chromium_src-a1ced36bfe270857f9e73c19338817be40d86720.tar.gz chromium_src-a1ced36bfe270857f9e73c19338817be40d86720.tar.bz2 | |
Make pulseaudio available for all posix platforms and add support on OpenBSD.
Patch by robert.nagy@gmail.com:
http://codereview.chromium.org/8499029/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/media/media.gyp b/media/media.gyp index 25bf46c..14acaed 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -63,8 +63,6 @@ 'audio/linux/alsa_util.h', 'audio/linux/alsa_wrapper.cc', 'audio/linux/alsa_wrapper.h', - 'audio/linux/pulse_output.cc', - 'audio/linux/pulse_output.h', 'audio/openbsd/audio_manager_openbsd.cc', 'audio/openbsd/audio_manager_openbsd.h', 'audio/mac/audio_input_mac.cc', @@ -77,6 +75,8 @@ 'audio/mac/audio_manager_mac.h', 'audio/mac/audio_output_mac.cc', 'audio/mac/audio_output_mac.h', + 'audio/pulse/pulse_output.cc', + 'audio/pulse/pulse_output.h', 'audio/simple_sources.cc', 'audio/simple_sources.h', 'audio/win/audio_low_latency_input_win.cc', @@ -299,32 +299,10 @@ '-lasound', ], }, - 'conditions': [ - ['OS=="linux"', { - 'conditions': [ - ['use_pulseaudio == 1', { - 'link_settings': { - 'libraries': [ - '-lpulse', - ], - }, - 'defines': [ - 'USE_PULSEAUDIO', - ], - }, { # else: use_pulseaudio == 0 - 'sources!': [ - 'audio/linux/pulse_output.cc', - 'audio/linux/pulse_output.h', - ], - }], - ], - }], - ], }], ['OS=="openbsd"', { 'sources/': [ ['exclude', '/alsa_' ], - ['exclude', '/audio_manager_linux' ], - ['exclude', '/pulse_' ] ], + ['exclude', '/audio_manager_linux' ] ], 'link_settings': { 'libraries': [ ], @@ -337,6 +315,26 @@ ], }], ['os_posix == 1', { + 'conditions': [ + ['use_pulseaudio == 1', { + 'cflags': [ + '<!@(pkg-config --cflags libpulse)', + ], + 'link_settings': { + 'libraries': [ + '<!@(pkg-config --libs-only-l libpulse)', + ], + }, + 'defines': [ + 'USE_PULSEAUDIO', + ], + }, { # else: use_pulseaudio == 0 + 'sources!': [ + 'audio/pulse/pulse_output.cc', + 'audio/pulse/pulse_output.h', + ], + }], + ], 'sources!': [ 'video/capture/video_capture_device_dummy.cc', 'video/capture/video_capture_device_dummy.h', |