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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 9826023: Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase ToT + address CR comments Created 8 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
« media/filters/audio_renderer_base.cc ('K') | « media/filters/pipeline_integration_test_base.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | 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 47d133778755012293362c368ba407e702a4d1d7..7b5ca06cf7d0265bb9cbf6b4eab942d2f865ed32 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -93,6 +93,8 @@
'audio/mac/audio_manager_mac.h',
'audio/mac/audio_output_mac.cc',
'audio/mac/audio_output_mac.h',
+ 'audio/null_audio_sink.cc',
+ 'audio/null_audio_sink.h',
'audio/pulse/pulse_output.cc',
'audio/pulse/pulse_output.h',
'audio/simple_sources.cc',
@@ -209,8 +211,6 @@
'filters/gpu_video_decoder.h',
'filters/in_memory_url_protocol.cc',
'filters/in_memory_url_protocol.h',
- 'filters/null_audio_renderer.cc',
- 'filters/null_audio_renderer.h',
'filters/video_frame_generator.cc',
'filters/video_frame_generator.h',
'filters/video_renderer_base.cc',
« media/filters/audio_renderer_base.cc ('K') | « media/filters/pipeline_integration_test_base.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698