webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h - Issue 1417683006: modules: more interface -> include renames

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_conference_mixer/interface/audio_conference_mixer.h

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fix last incorrectly wrapped pragma message 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:

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

Download patch

« no previous file with comments | « webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h ('k') | webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h

diff --git a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h

index 7ff39579ee08cf592de19b6769eb346695ac764a..7536ce9c28bb9d79ba128a7ccb81bfc23ac82a14 100644

--- a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h

+++ b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h

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

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

-#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_H_

-#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_H_

+#ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_

+#define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_

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

-#include "webrtc/modules/interface/module.h"

-#include "webrtc/modules/interface/module_common_types.h"

+#pragma message("WARNING: audio_conference_mixer/interface is DEPRECATED; use include")

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

+#include "webrtc/modules/include/module.h"

+#include "webrtc/modules/include/module_common_types.h"

namespace webrtc {

class AudioMixerOutputReceiver;

@@ -74,4 +76,4 @@ protected:

};

} // namespace webrtc

-#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_H_

+#endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INCLUDE_AUDIO_CONFERENCE_MIXER_H_