From 15c1c61e2c4eec26f714a08ef39ddba6ef30b82e Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 28 May 2013 08:13:20 +0000 Subject: [PATCH] Include files from webrtc/.. paths in audio_conference_mixer/ BUG=1662 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1565004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4117 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../interface/audio_conference_mixer.h | 6 +++--- .../interface/audio_conference_mixer_defines.h | 6 +++--- .../source/audio_conference_mixer_impl.cc | 16 ++++++++-------- .../source/audio_conference_mixer_impl.h | 16 ++++++++-------- .../source/audio_frame_manipulator.cc | 6 +++--- .../source/level_indicator.cc | 2 +- .../source/level_indicator.h | 2 +- .../audio_conference_mixer/source/memory_pool.h | 6 +++--- .../source/memory_pool_posix.h | 6 +++--- .../source/memory_pool_win.h | 6 +++--- .../source/time_scheduler.cc | 4 ++-- .../source/time_scheduler.h | 2 +- .../test/FunctionTest/functionTest.cc | 10 +++++----- .../test/FunctionTest/functionTest.h | 14 +++++++------- 14 files changed, 51 insertions(+), 51 deletions(-) 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 ef74324386..711dd51225 100644 --- a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h +++ b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_H_ -#include "audio_conference_mixer_defines.h" -#include "module.h" -#include "module_common_types.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" namespace webrtc { class AudioMixerOutputReceiver; diff --git a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h index 9b82d5ed75..fac071f48b 100644 --- a/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h +++ b/webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_INTERFACE_AUDIO_CONFERENCE_MIXER_DEFINES_H_ -#include "map_wrapper.h" -#include "module_common_types.h" -#include "typedefs.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/system_wrappers/interface/map_wrapper.h" +#include "webrtc/typedefs.h" namespace webrtc { class MixHistory; diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 29ff9f8283..107949bf47 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_conference_mixer_defines.h" -#include "audio_conference_mixer_impl.h" -#include "audio_frame_manipulator.h" -#include "audio_processing.h" -#include "critical_section_wrapper.h" -#include "map_wrapper.h" -#include "modules/utility/interface/audio_frame_operations.h" -#include "trace.h" +#include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h" +#include "webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h" +#include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h" +#include "webrtc/modules/audio_processing/include/audio_processing.h" +#include "webrtc/modules/utility/interface/audio_frame_operations.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/map_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h index c76dbf783c..46a9a8bfed 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h @@ -11,14 +11,14 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL_H_ -#include "audio_conference_mixer.h" -#include "engine_configurations.h" -#include "level_indicator.h" -#include "list_wrapper.h" -#include "memory_pool.h" -#include "module_common_types.h" -#include "scoped_ptr.h" -#include "time_scheduler.h" +#include "webrtc/engine_configurations.h" +#include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h" +#include "webrtc/modules/audio_conference_mixer/source/level_indicator.h" +#include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" +#include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/system_wrappers/interface/list_wrapper.h" +#include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { class AudioProcessing; diff --git a/webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc b/webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc index 9545caba71..6c1106dc42 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc +++ b/webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_frame_manipulator.h" -#include "module_common_types.h" -#include "typedefs.h" +#include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/typedefs.h" namespace { // Linear ramping over 80 samples. diff --git a/webrtc/modules/audio_conference_mixer/source/level_indicator.cc b/webrtc/modules/audio_conference_mixer/source/level_indicator.cc index 7afb30da92..2bac42c69e 100644 --- a/webrtc/modules/audio_conference_mixer/source/level_indicator.cc +++ b/webrtc/modules/audio_conference_mixer/source/level_indicator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "level_indicator.h" +#include "webrtc/modules/audio_conference_mixer/source/level_indicator.h" namespace webrtc { // Array for adding smothing to level changes (ad-hoc). diff --git a/webrtc/modules/audio_conference_mixer/source/level_indicator.h b/webrtc/modules/audio_conference_mixer/source/level_indicator.h index cf17d0ea08..fdf7837161 100644 --- a/webrtc/modules/audio_conference_mixer/source/level_indicator.h +++ b/webrtc/modules/audio_conference_mixer/source/level_indicator.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_LEVEL_INDICATOR_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_LEVEL_INDICATOR_H_ -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { class LevelIndicator diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool.h b/webrtc/modules/audio_conference_mixer/source/memory_pool.h index e9961cd957..36f2248753 100644 --- a/webrtc/modules/audio_conference_mixer/source/memory_pool.h +++ b/webrtc/modules/audio_conference_mixer/source/memory_pool.h @@ -13,12 +13,12 @@ #include -#include "typedefs.h" +#include "webrtc/typedefs.h" #if _WIN32 -#include "memory_pool_win.h" +#include "webrtc/modules/audio_conference_mixer/source/memory_pool_win.h" #else -#include "memory_pool_posix.h" +#include "webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h" #endif namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h b/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h index 20093660c5..3dd4e0e728 100644 --- a/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h +++ b/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h @@ -13,9 +13,9 @@ #include -#include "critical_section_wrapper.h" -#include "list_wrapper.h" -#include "typedefs.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/list_wrapper.h" +#include "webrtc/typedefs.h" namespace webrtc { template diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h b/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h index df440d0718..571b978fa8 100644 --- a/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h +++ b/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h @@ -14,9 +14,9 @@ #include #include -#include "aligned_malloc.h" -#include "atomic32.h" -#include "typedefs.h" +#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/typedefs.h" namespace webrtc { template struct MemoryPoolItem; diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc b/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc index 7c4216ed84..bfb7f01b22 100644 --- a/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc +++ b/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "critical_section_wrapper.h" -#include "time_scheduler.h" +#include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" namespace webrtc { TimeScheduler::TimeScheduler(const uint32_t periodicityInMs) diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.h b/webrtc/modules/audio_conference_mixer/source/time_scheduler.h index 31811d36b3..83d3a97b29 100644 --- a/webrtc/modules/audio_conference_mixer/source/time_scheduler.h +++ b/webrtc/modules/audio_conference_mixer/source/time_scheduler.h @@ -15,7 +15,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ -#include "tick_util.h" +#include "webrtc/system_wrappers/interface/tick_util.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.cc b/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.cc index 92cb33a705..3211b3c48c 100644 --- a/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.cc +++ b/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.cc @@ -12,11 +12,11 @@ #include #include -#include "functionTest.h" -#include "event_wrapper.h" -#include "trace.h" -#include "thread_wrapper.h" -#include "webrtc_vad.h" +#include "webrtc/common_audio/vad/include/webrtc_vad.h" +#include "webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" #if (defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)) #include diff --git a/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.h b/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.h index 505ad91b07..3b05c74396 100644 --- a/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.h +++ b/webrtc/modules/audio_conference_mixer/test/FunctionTest/functionTest.h @@ -11,13 +11,13 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_TEST_FUNCTIONTEST_FUNCTIONTEST_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_TEST_FUNCTIONTEST_FUNCTIONTEST_H_ -#include "module_common_types.h" -#include "level_indicator.h" -#include "list_wrapper.h" -#include "map_wrapper.h" -#include "audio_conference_mixer.h" -#include "audio_conference_mixer_defines.h" -#include "tick_util.h" +#include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h" +#include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h" +#include "webrtc/modules/audio_conference_mixer/source/level_indicator.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/system_wrappers/interface/list_wrapper.h" +#include "webrtc/system_wrappers/interface/map_wrapper.h" +#include "webrtc/system_wrappers/interface/tick_util.h" namespace webrtc { class EventWrapper;