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

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: moved the pulse code to AudioManagerPulse, and addressed Dale's comments. 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_input.h ('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..976bd50f7a0640487464d7d35330c59a74977bcc 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',
@@ -614,6 +620,10 @@
],
}, { # 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',
],
@@ -638,6 +648,10 @@
}],
['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',
'video/capture/video_capture_device_dummy.cc',
« media/audio/pulse/pulse_input.h ('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