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

Unified Diff: media/media.gyp

Issue 7473021: PulseAudio Sound Playback on Linux (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: "New buffering scheme, per offline with vrk" Created 9 years, 4 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
« media/audio/linux/pulse_output.cc ('K') | « media/base/media_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index d93ad411cfd127c9f054076d06138df4f73ce6e0..7cc36e40d1a4fe039d9df8add86b366ea9cf2e29 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -5,6 +5,8 @@
{
'variables': {
'chromium_code': 1,
+ # Override to dynamically link the PulseAudio library.
+ 'use_pulseaudio%': 0,
},
'targets': [
{
@@ -56,6 +58,8 @@
'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',
@@ -197,7 +201,7 @@
'video/capture/win/pin_base_win.h',
'video/capture/win/sink_filter_observer_win.h',
'video/capture/win/sink_filter_win.cc',
- 'video/capture/win/sink_filter_win.h',
+ 'video/capture/win/sink_filter_win.h',
'video/capture/win/sink_input_pin_win.cc',
'video/capture/win/sink_input_pin_win.h',
'video/capture/win/video_capture_device_win.cc',
@@ -228,12 +232,33 @@
],
},
'conditions': [
- ['OS == "linux" or OS == "freebsd" or OS == "solaris"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
'link_settings': {
'libraries': [
'-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_' ],
« media/audio/linux/pulse_output.cc ('K') | « media/base/media_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698