media/media.gyp - Issue 10855086: Disable AudioOutputMixer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/media.gyp

Issue 10855086: Disable AudioOutputMixer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comment instead of remove. Created 8 years, 4 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:

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 89467dc8e581d41d99742c05f21b16daea5ea950..2152370e35879aaa9c626077ee7743d279a4d7c8 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -52,6 +52,10 @@

'audio/audio_input_device.h',

'audio/audio_input_ipc.cc',

'audio/audio_input_ipc.h',

+ # TODO(dalecurtis): Temporarily disabled while switching pipeline to use

+ # float, http://crbug.com/114700

+ # 'audio/audio_output_mixer.cc',

+ # 'audio/audio_output_mixer.h',

'audio/audio_input_stream_impl.cc',

'audio/audio_input_stream_impl.h',

'audio/audio_io.h',

@@ -69,8 +73,6 @@

'audio/audio_output_dispatcher_impl.h',

'audio/audio_output_ipc.cc',

'audio/audio_output_ipc.h',

- 'audio/audio_output_mixer.cc',

- 'audio/audio_output_mixer.h',

'audio/audio_output_proxy.cc',

'audio/audio_output_proxy.h',

'audio/audio_parameters.cc',

« no previous file with comments | « media/audio/audio_output_proxy_unittest.cc ('k') | no next file » | no next file with comments »