Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index f31cdc98c81940f1a5b3466dec710c81e3a04a8c..665a87fd85d7cb133590c821b06fdace778309f2 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -137,8 +137,16 @@ |
| '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/pulse/pulse_wrapper.cc', |
| + 'audio/pulse/pulse_wrapper.h', |
| 'audio/sample_rates.cc', |
| 'audio/sample_rates.h', |
| 'audio/scoped_loop_observer.cc', |
| @@ -604,18 +612,26 @@ |
| 'cflags': [ |
| '<!@(pkg-config --cflags libpulse)', |
| ], |
| - 'link_settings': { |
| - 'libraries': [ |
| - '<!@(pkg-config --libs-only-l libpulse)', |
| - ], |
| - }, |
| +# 'link_settings': { |
|
DaleCurtis
2013/02/15 00:28:51
Delete?
no longer working on chromium
2013/02/15 16:07:33
Done.
|
| +# 'libraries': [ |
| +# '<!@(pkg-config --libs-only-l libpulse)', |
| +# ], |
| +# }, |
| 'defines': [ |
| 'USE_PULSEAUDIO', |
| ], |
| }, { # 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', |
| + 'audio/pulse/pulse_wrapper.cc', |
| + 'audio/pulse/pulse_wrapper.h', |
| ], |
| }], |
| ], |
| @@ -638,8 +654,16 @@ |
| }], |
| ['OS=="win"', { |
| 'sources!': [ |
| + 'audio/pulse/audio_manager_pulse.cc', |
|
DaleCurtis
2013/02/15 00:28:51
Why all this? We don't exclude audio_manager_linux
no longer working on chromium
2013/02/15 16:07:33
audio_manager_linux is automatically excluded beca
|
| + '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', |
| + 'audio/pulse/pulse_wrapper.cc', |
| + 'audio/pulse/pulse_wrapper.h', |
| 'video/capture/video_capture_device_dummy.cc', |
| 'video/capture/video_capture_device_dummy.h', |
| ], |