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

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

index 101de4060b3ce33d1c524f7d973527753e02e62c..492083e0a89f7d4f7c964ef23d1241440bb884c4 100644

--- a/webrtc/voice_engine/channel.h

+++ b/webrtc/voice_engine/channel.h

@@ -16,10 +16,6 @@

#include "webrtc/api/audio/audio_mixer.h"

#include "webrtc/api/audio_codecs/audio_encoder.h"

#include "webrtc/api/call/audio_sink.h"

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

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

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

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

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

#include "webrtc/common_types.h"

#include "webrtc/modules/audio_coding/acm2/codec_manager.h"

@@ -31,6 +27,10 @@

#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"

#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"

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

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

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

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

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

#include "webrtc/voice_engine/audio_level.h"

#include "webrtc/voice_engine/file_player.h"

#include "webrtc/voice_engine/file_recorder.h"

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