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

Side by Side Diff: media/media.gyp

Issue 8496007: A patch making the pulseaudio working with the threaded mainloop. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 }, 10 },
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 '-lasound', 297 '-lasound',
298 ], 298 ],
299 }, 299 },
300 'conditions': [ 300 'conditions': [
301 ['OS=="linux"', { 301 ['OS=="linux"', {
302 'conditions': [ 302 'conditions': [
303 ['use_pulseaudio == 1', { 303 ['use_pulseaudio == 1', {
304 'link_settings': { 304 'link_settings': {
305 'libraries': [ 305 'libraries': [
306 '-lpulse', 306 '-lpulse',
307 '-lpulse-mainloop-glib',
307 ], 308 ],
308 }, 309 },
309 'defines': [ 310 'defines': [
310 'USE_PULSEAUDIO', 311 'USE_PULSEAUDIO',
311 ], 312 ],
312 }, { # else: use_pulseaudio == 0 313 }, { # else: use_pulseaudio == 0
313 'sources!': [ 314 'sources!': [
314 'audio/linux/pulse_output.cc', 315 'audio/linux/pulse_output.cc',
315 'audio/linux/pulse_output.h', 316 'audio/linux/pulse_output.h',
316 ], 317 ],
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 881 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
881 ], 882 ],
882 'sources': [ 883 'sources': [
883 'tools/media_bench/media_bench.cc', 884 'tools/media_bench/media_bench.cc',
884 ], 885 ],
885 }, 886 },
886 ], 887 ],
887 }] 888 }]
888 ], 889 ],
889 } 890 }
OLDNEW
« media/audio/linux/pulse_output.cc ('K') | « media/audio/linux/pulse_output.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698