webrtc/modules/audio_coding/acm2/codec_manager.h - Issue 1481493004: audio_coding: remove "main" directory

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_coding/acm2/codec_manager.h

Issue 1481493004: audio_coding: remove "main" directory (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebased Created 5 years, 1 month 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/modules/audio_coding/acm2/codec_manager.h

diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.h b/webrtc/modules/audio_coding/acm2/codec_manager.h

similarity index 86%

rename from webrtc/modules/audio_coding/main/acm2/codec_manager.h

rename to webrtc/modules/audio_coding/acm2/codec_manager.h

index 7670bbd2deaf23d613386ca3c2b3b27924eaf8b5..61832e4f1052f0cc8987a2b13f8eee48d1123561 100644

--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.h

+++ b/webrtc/modules/audio_coding/acm2/codec_manager.h

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

* be found in the AUTHORS file in the root of the source tree.

-#ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_

-#define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_

+#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_

+#define WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_

#include <map>

@@ -17,8 +17,8 @@

#include "webrtc/base/optional.h"

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/base/thread_checker.h"

-#include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h"

-#include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h"

+#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"

+#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"

#include "webrtc/common_types.h"

namespace webrtc {

@@ -78,4 +78,4 @@ class CodecManager final {

} // namespace acm2

} // namespace webrtc

-#endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_

+#endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_