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

Unified Diff: media/media.gyp

Issue 10952024: Adding pulseaudio input support to chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: used the stubs script to do the dynamic linking Created 7 years, 10 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/pulse/pulse_util.cc ('K') | « media/audio/pulse/pulse_util.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 f31cdc98c81940f1a5b3466dec710c81e3a04a8c..4a0df69f590c1a4a05243bbdb2e16e490107aac1 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -137,8 +137,14 @@
'audio/null_audio_sink.h',
'audio/openbsd/audio_manager_openbsd.cc',
'audio/openbsd/audio_manager_openbsd.h',
+ 'audio/pulse/audio_manager_pulse.cc',
+ 'audio/pulse/audio_manager_pulse.h',
'audio/pulse/pulse_output.cc',
'audio/pulse/pulse_output.h',
+ 'audio/pulse/pulse_input.cc',
+ 'audio/pulse/pulse_input.h',
+ 'audio/pulse/pulse_util.cc',
+ 'audio/pulse/pulse_util.h',
'audio/sample_rates.cc',
'audio/sample_rates.h',
'audio/scoped_loop_observer.cc',
@@ -604,18 +610,82 @@
'cflags': [
'<!@(pkg-config --cflags libpulse)',
],
- 'link_settings': {
- 'libraries': [
- '<!@(pkg-config --libs-only-l libpulse)',
- ],
- },
'defines': [
'USE_PULSEAUDIO',
],
+ 'variables': {
+ 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
DaleCurtis 2013/02/20 00:17:38 For the variables which are only used once, just p
no longer working on chromium 2013/02/20 14:43:38 Only sig_files and outfile_type are used once, I h
+ 'extra_header': 'audio/pulse/pulse_stub_header.fragment',
+ 'sig_files': ['audio/pulse/pulse.sigs'],
+ 'outfile_type': 'posix_stubs',
+ 'stubs_filename_root': 'pulse_stubs',
+ 'project_path': 'media/audio/pulse',
+ 'intermediate_dir': '<(INTERMEDIATE_DIR)',
+ 'output_root': '<(SHARED_INTERMEDIATE_DIR)/pulse',
+ },
+ 'sources': [
+ '<(extra_header)',
+ ],
+ 'include_dirs': [
+ '<(output_root)',
+ '..',
DaleCurtis 2013/02/20 00:17:38 Is .. necessary for this?
no longer working on chromium 2013/02/20 14:43:38 We need to include the output_root since the heade
+ ],
+ 'dependencies': [
DaleCurtis 2013/02/20 00:17:38 base is already a dependency elsewhere.
no longer working on chromium 2013/02/20 14:43:38 Removed.
+ # Required for the logging done in the stubs generator.
+ '../base/base.gyp:base',
+ ],
+ 'direct_dependent_settings': {
DaleCurtis 2013/02/20 00:17:38 These shouldn't be necessary here since you're in
no longer working on chromium 2013/02/20 14:43:38 Removed
+ 'include_dirs': [
+ '<(output_root)',
+ '..',
+ ],
+ },
+ 'actions': [
+ {
+ 'action_name': 'generate_stubs',
+ 'inputs': [
+ '<(generate_stubs_script)',
+ '<(extra_header)',
+ '<@(sig_files)',
+ ],
+ 'outputs': [
+ '<(intermediate_dir)/<(stubs_filename_root).cc',
+ '<(output_root)/<(project_path)/<(stubs_filename_root).h',
+ ],
+ 'action': ['python',
+ '<(generate_stubs_script)',
+ '-i', '<(intermediate_dir)',
+ '-o', '<(output_root)/<(project_path)',
+ '-t', '<(outfile_type)',
+ '-e', '<(extra_header)',
+ '-s', '<(stubs_filename_root)',
+ '-p', '<(project_path)',
+ '<@(_inputs)',
+ ],
+ 'process_outputs_as_sources': 1,
+ 'message': 'Generating Pulse stubs for dynamic loading.',
+ },
+ ],
+ 'conditions': [
+ # Linux/Solaris need libdl for dlopen() and friends.
+ ['OS == "linux" or OS == "solaris"', {
+ 'link_settings': {
+ 'libraries': [
+ '-ldl',
+ ],
+ },
+ }],
+ ],
}, { # else: use_pulseaudio == 0
'sources!': [
+ 'audio/pulse/audio_manager_pulse.cc',
+ 'audio/pulse/audio_manager_pulse.h',
+ 'audio/pulse/pulse_input.cc',
+ 'audio/pulse/pulse_input.h',
'audio/pulse/pulse_output.cc',
'audio/pulse/pulse_output.h',
+ 'audio/pulse/pulse_util.cc',
+ 'audio/pulse/pulse_util.h',
],
}],
],
@@ -638,8 +708,14 @@
}],
['OS=="win"', {
'sources!': [
+ 'audio/pulse/audio_manager_pulse.cc',
+ 'audio/pulse/audio_manager_pulse.h',
+ 'audio/pulse/pulse_input.cc',
+ 'audio/pulse/pulse_input.h',
'audio/pulse/pulse_output.cc',
'audio/pulse/pulse_output.h',
+ 'audio/pulse/pulse_util.cc',
+ 'audio/pulse/pulse_util.h',
'video/capture/video_capture_device_dummy.cc',
'video/capture/video_capture_device_dummy.h',
],
« media/audio/pulse/pulse_util.cc ('K') | « media/audio/pulse/pulse_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698