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

Unified Diff: media/media.gyp

Issue 10592014: media/audio/linux: Add CrasInputStream. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: don't allow re-start, use event in UT, and clean up set-volume. Created 8 years, 6 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 7ac3890acbf0b90a0305b9b2094f06a7dc641313..def7f7636daa6908084846f895c3e2616663faf0 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -86,6 +86,8 @@
'audio/linux/alsa_util.h',
'audio/linux/alsa_wrapper.cc',
'audio/linux/alsa_wrapper.h',
+ 'audio/linux/cras_input.cc',
+ 'audio/linux/cras_input.h',
'audio/linux/cras_output.cc',
'audio/linux/cras_output.h',
'audio/openbsd/audio_manager_openbsd.cc',
@@ -392,6 +394,8 @@
],
}, { # else: use_cras == 0
'sources!': [
+ 'audio/linux/cras_input.cc',
+ 'audio/linux/cras_input.h',
'audio/linux/cras_output.cc',
'audio/linux/cras_output.h',
],
@@ -739,6 +743,7 @@
'conditions': [
['use_cras == 1', {
'sources': [
+ 'audio/linux/cras_input_unittest.cc',
'audio/linux/cras_output_unittest.cc',
],
'defines': [
« media/audio/linux/cras_input_unittest.cc ('K') | « media/audio/linux/cras_input_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698