webrtc/voice_engine/output_mixer.h - Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3)

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/voice_engine/output_mixer.h

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)

Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 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:

Index: webrtc/voice_engine/output_mixer.h

diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/voice_engine/output_mixer.h

index 79c5e097ea25d951857f110ebcbd4f72fe1f652c..fe0cb308f162f928b0814d3f3a579de7266dfa73 100644

--- a/webrtc/voice_engine/output_mixer.h

+++ b/webrtc/voice_engine/output_mixer.h

@@ -13,11 +13,11 @@

#include <memory>

-#include "webrtc/base/criticalsection.h"

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

#include "webrtc/common_types.h"

#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"

#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"

+#include "webrtc/rtc_base/criticalsection.h"

#include "webrtc/voice_engine/file_recorder.h"

namespace webrtc {

« no previous file with comments | « webrtc/voice_engine/include/voe_base.h ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »