webrtc/modules/audio_mixer/audio_mixer.h - Issue 2238803002: Changed folder structure in new mixer and fixed simple lint errors.

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: webrtc/modules/audio_mixer/audio_mixer.h

Issue 2238803002: Changed folder structure in new mixer and fixed simple lint errors. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Small changes in response to comments. Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: webrtc/modules/audio_mixer/audio_mixer.h

diff --git a/webrtc/modules/audio_mixer/audio_mixer.h b/webrtc/modules/audio_mixer/audio_mixer.h

index 9aabfcca5b751a885e93aa67e11edef5f2ae805d..78cd4e5c79a2ddab2ea9f3bfff383a8f501ac74c 100644

--- a/webrtc/modules/audio_mixer/audio_mixer.h

+++ b/webrtc/modules/audio_mixer/audio_mixer.h

@@ -14,8 +14,8 @@

#include "webrtc/base/criticalsection.h"

#include "webrtc/common_audio/resampler/include/push_resampler.h"

#include "webrtc/common_types.h"

-#include "webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h"

-#include "webrtc/modules/audio_mixer/include/audio_mixer_defines.h"

+#include "webrtc/modules/audio_mixer/new_audio_conference_mixer.h"

+#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"

#include "webrtc/modules/utility/include/file_recorder.h"

#include "webrtc/voice_engine/level_indicator.h"

#include "webrtc/voice_engine/voice_engine_defines.h"

« no previous file with comments | « webrtc/modules/audio_mixer/audio_frame_manipulator.cc ('k') | webrtc/modules/audio_mixer/audio_mixer.gypi » ('j') | no next file with comments »