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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 12310101: Enable pulse as the default IO handling in Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added UMA histogram Created 7 years, 9 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
« no previous file with comments | « 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 5fc573aae8bb08f771ed68a5cf1002d26e1e69b8..b1e3d889e32fb96a42e2c086b4d5918acbd88911 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -5,8 +5,6 @@
{
'variables': {
'chromium_code': 1,
- # Override to dynamically link the PulseAudio library.
- 'use_pulseaudio%': 0,
# Override to dynamically link the cras (ChromeOS audio) library.
'use_cras%': 0,
'conditions': [
@@ -640,80 +638,72 @@
'audio/cras/cras_output.h',
],
}],
- ['os_posix == 1', {
- 'conditions': [
- ['use_pulseaudio == 1', {
- 'cflags': [
- '<!@(pkg-config --cflags libpulse)',
- ],
- 'defines': [
- 'USE_PULSEAUDIO',
- ],
- 'variables': {
- 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
- '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': [
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ 'variables': {
+ 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
+ '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)',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'generate_stubs',
+ 'inputs': [
+ '<(generate_stubs_script)',
'<(extra_header)',
+ '<@(sig_files)',
],
- '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',
- ],
- },
- }],
+ 'outputs': [
+ '<(intermediate_dir)/<(stubs_filename_root).cc',
+ '<(output_root)/<(project_path)/<(stubs_filename_root).h',
],
- }, { # 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',
+ '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: OS=="win or OS == "mac" or OS == "ios" or OS == "android"
+ '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',
+ ],
+ }],
+ ['os_posix == 1', {
'sources!': [
'video/capture/video_capture_device_dummy.cc',
'video/capture/video_capture_device_dummy.h',
@@ -733,14 +723,6 @@
}],
['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',
],
« no previous file with comments | « media/base/media_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698