diff options
author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-11 13:24:38 +0000 |
---|---|---|
committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-11 13:24:38 +0000 |
commit | 811269df40fd8cd036b68cfe39bc04cacac0a698 (patch) | |
tree | 9309ebd000a4fad3b5aa4e6aeeed9b0088a165e0 | |
parent | db6e3f8bc577812a2e4fca0e3c5e80942c2a9d6c (diff) | |
download | webrtc-811269df40fd8cd036b68cfe39bc04cacac0a698.tar.gz |
Include files from webrtc/.. paths in audio_device/.
BUG=1662
R=xians@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1785005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4330 4adac7df-926f-26a2-2b94-8c16560cd09d
60 files changed, 205 insertions, 214 deletions
diff --git a/webrtc/modules/audio_device/android/audio_device_jni_android.cc b/webrtc/modules/audio_device/android/audio_device_jni_android.cc index d6375382e3..33b7db983d 100644 --- a/webrtc/modules/audio_device/android/audio_device_jni_android.cc +++ b/webrtc/modules/audio_device/android/audio_device_jni_android.cc @@ -18,13 +18,13 @@ #include <android/log.h> #include <stdlib.h> -#include "audio_device_utility.h" -#include "audio_device_jni_android.h" -#include "audio_device_config.h" +#include "webrtc/modules/audio_device/android/audio_device_jni_android.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" -#include "trace.h" -#include "thread_wrapper.h" -#include "event_wrapper.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/audio_device_jni_android.h b/webrtc/modules/audio_device/android/audio_device_jni_android.h index dee9eac53b..677d375664 100644 --- a/webrtc/modules/audio_device/android/audio_device_jni_android.h +++ b/webrtc/modules/audio_device/android/audio_device_jni_android.h @@ -15,8 +15,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H -#include "audio_device_generic.h" -#include "critical_section_wrapper.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include <jni.h> // For accessing AudioDeviceAndroid java class diff --git a/webrtc/modules/audio_device/android/audio_device_opensles_android.cc b/webrtc/modules/audio_device/android/audio_device_opensles_android.cc index dd0805df99..77479bdeee 100644 --- a/webrtc/modules/audio_device/android/audio_device_opensles_android.cc +++ b/webrtc/modules/audio_device/android/audio_device_opensles_android.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/audio_device/android/audio_device_opensles_android.h" +#include "webrtc/modules/audio_device/android/audio_device_opensles_android.h" #ifdef WEBRTC_ANDROID_DEBUG #include <android/log.h> @@ -18,10 +18,10 @@ #include <sys/time.h> #include <time.h> -#include "modules/audio_device/audio_device_utility.h" -#include "system_wrappers/interface/event_wrapper.h" -#include "system_wrappers/interface/thread_wrapper.h" -#include "system_wrappers/interface/trace.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" #ifdef WEBRTC_ANDROID_DEBUG #define WEBRTC_OPENSL_TRACE(a, b, c, ...) \ diff --git a/webrtc/modules/audio_device/android/audio_device_opensles_android.h b/webrtc/modules/audio_device/android/audio_device_opensles_android.h index 578999fa72..c33a034352 100644 --- a/webrtc/modules/audio_device/android/audio_device_opensles_android.h +++ b/webrtc/modules/audio_device/android/audio_device_opensles_android.h @@ -21,8 +21,8 @@ #include <queue> -#include "modules/audio_device/audio_device_generic.h" -#include "system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/audio_device_utility_android.cc b/webrtc/modules/audio_device/android/audio_device_utility_android.cc index b3dadf4399..73c9417719 100644 --- a/webrtc/modules/audio_device/android/audio_device_utility_android.cc +++ b/webrtc/modules/audio_device/android/audio_device_utility_android.cc @@ -12,10 +12,10 @@ * Android audio device utility implementation */ -#include "audio_device_utility_android.h" +#include "webrtc/modules/audio_device/android/audio_device_utility_android.h" -#include "critical_section_wrapper.h" -#include "trace.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/android/audio_device_utility_android.h b/webrtc/modules/audio_device/android/audio_device_utility_android.h index ae66e42823..c677099d5e 100644 --- a/webrtc/modules/audio_device/android/audio_device_utility_android.h +++ b/webrtc/modules/audio_device/android/audio_device_utility_android.h @@ -15,8 +15,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_ANDROID_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_ANDROID_H -#include "audio_device_utility.h" -#include "audio_device.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/webrtc/modules/audio_device/audio_device_buffer.cc index 779641dc81..63218ddfc4 100644 --- a/webrtc/modules/audio_device/audio_device_buffer.cc +++ b/webrtc/modules/audio_device/audio_device_buffer.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "trace.h" -#include "critical_section_wrapper.h" -#include "audio_device_buffer.h" -#include "audio_device_utility.h" -#include "audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_buffer.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" +#include <cassert> #include <stdlib.h> #include <string.h> -#include <cassert> -#include "signal_processing_library.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_buffer.h b/webrtc/modules/audio_device/audio_device_buffer.h index 6a02c2be24..90e07de8e9 100644 --- a/webrtc/modules/audio_device/audio_device_buffer.h +++ b/webrtc/modules/audio_device/audio_device_buffer.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H -#include "typedefs.h" -#include "common_audio/resampler/include/resampler.h" -#include "file_wrapper.h" -#include "audio_device.h" -#include "list_wrapper.h" +#include "webrtc/common_audio/resampler/include/resampler.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/interface/list_wrapper.h" +#include "webrtc/typedefs.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/audio_device/audio_device_generic.cc b/webrtc/modules/audio_device/audio_device_generic.cc index 27ea604095..543c6ffc66 100644 --- a/webrtc/modules/audio_device/audio_device_generic.cc +++ b/webrtc/modules/audio_device/audio_device_generic.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_generic.h" -#include "trace.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { @@ -73,4 +73,3 @@ bool AudioDeviceGeneric::BuiltInAECIsEnabled() const } } // namespace webrtc - diff --git a/webrtc/modules/audio_device/audio_device_generic.h b/webrtc/modules/audio_device/audio_device_generic.h index 0136790041..8038028029 100644 --- a/webrtc/modules/audio_device/audio_device_generic.h +++ b/webrtc/modules/audio_device/audio_device_generic.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H -#include "audio_device.h" -#include "audio_device_buffer.h" +#include "webrtc/modules/audio_device/audio_device_buffer.h" +#include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { @@ -180,4 +180,3 @@ public: } // namespace webrtc #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H - diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc index 978a7b6573..9acaf80480 100644 --- a/webrtc/modules/audio_device/audio_device_impl.cc +++ b/webrtc/modules/audio_device/audio_device_impl.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_impl.h" -#include "audio_device_config.h" -#include "common_audio/signal_processing/include/signal_processing_library.h" -#include "system_wrappers/interface/ref_count.h" +#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_impl.h" +#include "webrtc/system_wrappers/interface/ref_count.h" #include <assert.h> #include <string.h> @@ -45,10 +45,10 @@ #include "audio_device_utility_mac.h" #include "audio_device_mac.h" #endif -#include "audio_device_dummy.h" -#include "audio_device_utility_dummy.h" -#include "critical_section_wrapper.h" -#include "trace.h" +#include "webrtc/modules/audio_device/dummy/audio_device_dummy.h" +#include "webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" #define CHECK_INITIALIZED() \ { \ diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h index 8cbfbf53ea..d34543b2f9 100644 --- a/webrtc/modules/audio_device/audio_device_impl.h +++ b/webrtc/modules/audio_device/audio_device_impl.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H -#include "audio_device.h" -#include "audio_device_buffer.h" +#include "webrtc/modules/audio_device/audio_device_buffer.h" +#include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_utility.cc b/webrtc/modules/audio_device/audio_device_utility.cc index 428401134a..b272c7e5f8 100644 --- a/webrtc/modules/audio_device/audio_device_utility.cc +++ b/webrtc/modules/audio_device/audio_device_utility.cc @@ -10,7 +10,7 @@ #include <cassert> -#include "audio_device_utility.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" #if defined(_WIN32) @@ -52,11 +52,11 @@ bool AudioDeviceUtility::StringCompare( // Linux & Mac // ============================================================================ -#include <sys/time.h> // gettimeofday -#include <time.h> // gettimeofday -#include <string.h> // strncasecmp #include <stdio.h> // getchar +#include <string.h> // strncasecmp +#include <sys/time.h> // gettimeofday #include <termios.h> // tcgetattr +#include <time.h> // gettimeofday #include <unistd.h> @@ -110,5 +110,3 @@ bool AudioDeviceUtility::StringCompare( } // namespace webrtc #endif // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) - - diff --git a/webrtc/modules/audio_device/audio_device_utility.h b/webrtc/modules/audio_device/audio_device_utility.h index 10efbbc122..eb3e623e55 100644 --- a/webrtc/modules/audio_device/audio_device_utility.h +++ b/webrtc/modules/audio_device/audio_device_utility.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { @@ -32,4 +32,3 @@ public: } // namespace webrtc #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H - diff --git a/webrtc/modules/audio_device/dummy/audio_device_dummy.h b/webrtc/modules/audio_device/dummy/audio_device_dummy.h index 3c0ad8917b..78baa2ef56 100644 --- a/webrtc/modules/audio_device/dummy/audio_device_dummy.h +++ b/webrtc/modules/audio_device/dummy/audio_device_dummy.h @@ -13,7 +13,7 @@ #include <stdio.h> -#include "audio_device_generic.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h b/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h index 5cc49d393c..8ae89c8c8d 100644 --- a/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h +++ b/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_DUMMY_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_DUMMY_H -#include "audio_device_utility.h" -#include "audio_device.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/include/audio_device.h b/webrtc/modules/audio_device/include/audio_device.h index 7b6d5e11c3..eb403aa9b9 100644 --- a/webrtc/modules/audio_device/include/audio_device.h +++ b/webrtc/modules/audio_device/include/audio_device.h @@ -11,8 +11,8 @@ #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_ -#include "modules/audio_device/include/audio_device_defines.h" -#include "modules/interface/module.h" +#include "webrtc/modules/audio_device/include/audio_device_defines.h" +#include "webrtc/modules/interface/module.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/include/audio_device_defines.h b/webrtc/modules/audio_device/include/audio_device_defines.h index 8f375e8338..ce5fd7b3de 100644 --- a/webrtc/modules/audio_device/include/audio_device_defines.h +++ b/webrtc/modules/audio_device/include/audio_device_defines.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DEFINES_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DEFINES_H -#include "typedefs.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.cc b/webrtc/modules/audio_device/ios/audio_device_ios.cc index f9691f35fc..bad3915f14 100644 --- a/webrtc/modules/audio_device/ios/audio_device_ios.cc +++ b/webrtc/modules/audio_device/ios/audio_device_ios.cc @@ -10,10 +10,10 @@ #include <AudioToolbox/AudioServices.h> // AudioSession -#include "audio_device_ios.h" +#include "webrtc/modules/audio_device/ios/audio_device_ios.h" -#include "trace.h" -#include "thread_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { AudioDeviceIPhone::AudioDeviceIPhone(const int32_t id) @@ -1895,4 +1895,3 @@ bool AudioDeviceIPhone::CaptureWorkerThread() { } } // namespace webrtc - diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.h b/webrtc/modules/audio_device/ios/audio_device_ios.h index 6b93d0bd7f..fdaf94d6a6 100644 --- a/webrtc/modules/audio_device/ios/audio_device_ios.h +++ b/webrtc/modules/audio_device/ios/audio_device_ios.h @@ -13,8 +13,8 @@ #include <AudioUnit/AudioUnit.h> -#include "audio_device_generic.h" -#include "critical_section_wrapper.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" namespace webrtc { class ThreadWrapper; diff --git a/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc b/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc index b8cf218ff6..6bbceb921f 100644 --- a/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc +++ b/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_utility_ios.h" -#include "audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/ios/audio_device_utility_ios.h" -#include "critical_section_wrapper.h" -#include "trace.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { AudioDeviceUtilityIPhone::AudioDeviceUtilityIPhone(const int32_t id) diff --git a/webrtc/modules/audio_device/ios/audio_device_utility_ios.h b/webrtc/modules/audio_device/ios/audio_device_utility_ios.h index e9f8c5455f..081ab82d7b 100644 --- a/webrtc/modules/audio_device/ios/audio_device_utility_ios.h +++ b/webrtc/modules/audio_device/ios/audio_device_utility_ios.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_IPHONE_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_IPHONE_H -#include "audio_device_utility.h" -#include "audio_device.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc b/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc index 1b1707cb41..a391590787 100644 --- a/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc +++ b/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "alsasymboltable_linux.h" +#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h" namespace webrtc_adm_linux_alsa { diff --git a/webrtc/modules/audio_device/linux/alsasymboltable_linux.h b/webrtc/modules/audio_device/linux/alsasymboltable_linux.h index d25bbd7860..82690c5007 100644 --- a/webrtc/modules/audio_device/linux/alsasymboltable_linux.h +++ b/webrtc/modules/audio_device/linux/alsasymboltable_linux.h @@ -28,7 +28,7 @@ #ifndef WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H #define WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H -#include "latebindingsymboltable_linux.h" +#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h" namespace webrtc_adm_linux_alsa { diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc index ca45a755e1..b2e8702b17 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -10,14 +10,14 @@ #include <cassert> -#include "audio_device_utility.h" -#include "audio_device_alsa_linux.h" -#include "audio_device_config.h" - -#include "event_wrapper.h" -#include "system_wrappers/interface/sleep.h" -#include "trace.h" -#include "thread_wrapper.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h" + +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h index de6deb2eea..924475859d 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h @@ -11,15 +11,15 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H -#include "audio_device_generic.h" -#include "audio_mixer_manager_alsa_linux.h" -#include "critical_section_wrapper.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include <X11/Xlib.h> #include <alsa/asoundlib.h> -#include <sys/soundcard.h> #include <sys/ioctl.h> -#include <X11/Xlib.h> +#include <sys/soundcard.h> namespace webrtc diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc index bc3e621341..04de0c6439 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -10,13 +10,13 @@ #include <cassert> -#include "audio_device_utility.h" -#include "audio_device_pulse_linux.h" -#include "audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/linux/audio_device_pulse_linux.h" -#include "event_wrapper.h" -#include "trace.h" -#include "thread_wrapper.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h index 3b8a181f07..433dc24d1a 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h @@ -11,12 +11,12 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H -#include "audio_device_generic.h" -#include "audio_mixer_manager_pulse_linux.h" -#include "critical_section_wrapper.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include <pulse/pulseaudio.h> #include <X11/Xlib.h> +#include <pulse/pulseaudio.h> // We define this flag if it's missing from our headers, because we want to be // able to compile against old headers but still use PA_STREAM_ADJUST_LATENCY diff --git a/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc b/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc index a053f5b104..d714f8fc30 100644 --- a/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_utility_linux.h" -#include "audio_device_config.h" // DEBUG_PRINT() -#include "critical_section_wrapper.h" -#include "trace.h" +#include "webrtc/modules/audio_device/audio_device_config.h" // DEBUG_PRINT() +#include "webrtc/modules/audio_device/linux/audio_device_utility_linux.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/linux/audio_device_utility_linux.h b/webrtc/modules/audio_device/linux/audio_device_utility_linux.h index 75e52b4e75..b56023fa7f 100644 --- a/webrtc/modules/audio_device/linux/audio_device_utility_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_utility_linux.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_LINUX_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_LINUX_H -#include "audio_device_utility.h" -#include "audio_device.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc index e3acebd039..a70b8e2885 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc @@ -10,8 +10,8 @@ #include <cassert> -#include "audio_mixer_manager_alsa_linux.h" -#include "trace.h" +#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" +#include "webrtc/system_wrappers/interface/trace.h" extern webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h index 99ca29615c..21618e2f83 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H -#include "typedefs.h" -#include "audio_device.h" -#include "critical_section_wrapper.h" -#include "alsasymboltable_linux.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/typedefs.h" #include <alsa/asoundlib.h> diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc index b32718c149..953891236b 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc @@ -10,8 +10,8 @@ #include <cassert> -#include "audio_mixer_manager_pulse_linux.h" -#include "trace.h" +#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" +#include "webrtc/system_wrappers/interface/trace.h" extern webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable; @@ -1265,4 +1265,3 @@ bool AudioMixerManagerLinuxPulse::GetSourceInfoByIndex( } } - diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h index 3d913955df..9296c76488 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -11,13 +11,13 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H -#include "typedefs.h" -#include "audio_device.h" -#include "critical_section_wrapper.h" -#include "pulseaudiosymboltable_linux.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/typedefs.h" -#include <stdint.h> #include <pulse/pulseaudio.h> +#include <stdint.h> #ifndef UINT32_MAX #define UINT32_MAX ((uint32_t)-1) diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc index 156ae18e1c..d6a216216c 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "latebindingsymboltable_linux.h" +#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h" #ifdef WEBRTC_LINUX #include <dlfcn.h> diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h index 91d25aa2dc..b5186fa7bf 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -32,8 +32,8 @@ #include <stddef.h> // for NULL #include <string.h> -#include "constructor_magic.h" -#include "trace.h" +#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/system_wrappers/interface/trace.h" // This file provides macros for creating "symbol table" classes to simplify the // dynamic loading of symbols from DLLs. Currently the implementation only diff --git a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc index ae663f700d..1f1890a6d9 100644 --- a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc +++ b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "pulseaudiosymboltable_linux.h" +#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h" namespace webrtc_adm_linux_pulse { diff --git a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h index 049509ba87..7f3ccabef5 100644 --- a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h +++ b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h @@ -28,7 +28,7 @@ #ifndef WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H #define WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H -#include "latebindingsymboltable_linux.h" +#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h" namespace webrtc_adm_linux_pulse { diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.cc b/webrtc/modules/audio_device/mac/audio_device_mac.cc index 3cf742b8f6..3e669ee998 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_device_mac.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_utility.h" -#include "audio_device_mac.h" -#include "audio_device_config.h" - -#include "event_wrapper.h" -#include "portaudio/pa_ringbuffer.h" -#include "trace.h" -#include "thread_wrapper.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/mac/audio_device_mac.h" + +#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" #include <ApplicationServices/ApplicationServices.h> #include <cassert> diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/webrtc/modules/audio_device/mac/audio_device_mac.h index 19eb7c7986..7ad4fa0633 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.h +++ b/webrtc/modules/audio_device/mac/audio_device_mac.h @@ -11,12 +11,12 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H -#include "audio_device_generic.h" -#include "critical_section_wrapper.h" -#include "audio_mixer_manager_mac.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include <CoreAudio/CoreAudio.h> #include <AudioToolbox/AudioConverter.h> +#include <CoreAudio/CoreAudio.h> #include <mach/semaphore.h> struct PaUtilRingBuffer; diff --git a/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc b/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc index 0aa74c0bc3..10e9659db0 100644 --- a/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_utility_mac.h" -#include "audio_device_config.h" // DEBUG_PRINT() -#include "critical_section_wrapper.h" -#include "trace.h" +#include "webrtc/modules/audio_device/audio_device_config.h" // DEBUG_PRINT() +#include "webrtc/modules/audio_device/mac/audio_device_utility_mac.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/mac/audio_device_utility_mac.h b/webrtc/modules/audio_device/mac/audio_device_utility_mac.h index 5a96cd8a41..71e07a4ab1 100644 --- a/webrtc/modules/audio_device/mac/audio_device_utility_mac.h +++ b/webrtc/modules/audio_device/mac/audio_device_utility_mac.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_MAC_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_MAC_H -#include "audio_device_utility.h" -#include "audio_device.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc index e7a8b52a13..08e419750e 100644 --- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_mixer_manager_mac.h" -#include "trace.h" +#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" +#include "webrtc/system_wrappers/interface/trace.h" #include <unistd.h> // getpid() diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h index c5024d1229..711d36d150 100644 --- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h +++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H -#include "typedefs.h" -#include "audio_device.h" -#include "critical_section_wrapper.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/typedefs.h" #include <CoreAudio/CoreAudio.h> diff --git a/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c b/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c index 310d719f2c..cb6b8e5d9e 100644 --- a/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c +++ b/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c @@ -52,12 +52,12 @@ @ingroup common_src */ +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "pa_ringbuffer.h" #include <string.h> -#include "pa_memorybarrier.h" +#include "webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h" +#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h" /*************************************************************************** * Initialize FIFO. diff --git a/webrtc/modules/audio_device/main/interface/audio_device.h b/webrtc/modules/audio_device/main/interface/audio_device.h index 551784f4a8..71f16b685a 100644 --- a/webrtc/modules/audio_device/main/interface/audio_device.h +++ b/webrtc/modules/audio_device/main/interface/audio_device.h @@ -11,6 +11,6 @@ #ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_ -#include "../../include/audio_device.h" +#include "webrtc/modules/audio_device/include/audio_device.h" #endif // MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_ diff --git a/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc b/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc index f46c6b2969..9e4c62c5a5 100644 --- a/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc +++ b/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <string.h> // memset #include <android/log.h> +#include <string.h> // memset -#include "org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h" +#include "webrtc/modules/audio_device/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h" -#include "../../../../interface/audio_device.h" +#include "webrtc/modules/audio_device/main/interface/audio_device.h" #define LOG_TAG "WebRTC ADM Native" diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc index 4705f0a530..e6c7261149 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc @@ -12,15 +12,15 @@ #include <stdio.h> #include <string.h> -#include "audio_device_test_defines.h" +#include "webrtc/modules/audio_device/test/audio_device_test_defines.h" -#include "gtest/gtest.h" -#include "testsupport/fileutils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/testsupport/fileutils.h" -#include "modules/audio_device/audio_device_config.h" -#include "modules/audio_device/audio_device_impl.h" -#include "modules/audio_device/audio_device_utility.h" -#include "system_wrappers/interface/sleep.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_impl.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/system_wrappers/interface/sleep.h" // Helper functions #if defined(ANDROID) diff --git a/webrtc/modules/audio_device/test/audio_device_test_defines.h b/webrtc/modules/audio_device/test/audio_device_test_defines.h index 4ac2a41cc2..479861b125 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_defines.h +++ b/webrtc/modules/audio_device/test/audio_device_test_defines.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H -#include "audio_device.h" -#include "common_types.h" -#include "process_thread.h" -#include "trace.h" +#include "webrtc/common_types.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/modules/utility/interface/process_thread.h" +#include "webrtc/system_wrappers/interface/trace.h" #ifdef _WIN32 #define MACRO_DEFAULT_DEVICE AudioDeviceModule::kDefaultDevice @@ -74,4 +74,3 @@ const char* GetFilename(const char* filename); const char* GetResource(const char* resource); #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H - diff --git a/webrtc/modules/audio_device/test/audio_device_test_func.cc b/webrtc/modules/audio_device/test/audio_device_test_func.cc index 53cfbe22dc..fcbbb865de 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_func.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_func.cc @@ -9,8 +9,8 @@ */ #include <stdio.h> -#include "audio_device_test_defines.h" -#include "func_test_manager.h" +#include "webrtc/modules/audio_device/test/audio_device_test_defines.h" +#include "webrtc/modules/audio_device/test/func_test_manager.h" #ifndef __GNUC__ // Disable warning message 4996 ('scanf': This function or variable may be unsafe) diff --git a/webrtc/modules/audio_device/test/func_test_manager.cc b/webrtc/modules/audio_device/test/func_test_manager.cc index e48cd338e2..eee85cbde3 100644 --- a/webrtc/modules/audio_device/test/func_test_manager.cc +++ b/webrtc/modules/audio_device/test/func_test_manager.cc @@ -8,18 +8,18 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <stdio.h> -#include <ctype.h> #include <cassert> +#include <ctype.h> +#include <stdio.h> #include <string.h> -#include "func_test_manager.h" -#include "gtest/gtest.h" -#include "system_wrappers/interface/sleep.h" -#include "testsupport/fileutils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/modules/audio_device/test/func_test_manager.h" +#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/test/testsupport/fileutils.h" -#include "modules/audio_device/audio_device_config.h" -#include "modules/audio_device/audio_device_impl.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_impl.h" #ifndef __GNUC__ // Disable warning message ('sprintf': name was marked as #pragma deprecated) diff --git a/webrtc/modules/audio_device/test/func_test_manager.h b/webrtc/modules/audio_device/test/func_test_manager.h index ea39d28239..23d26c6723 100644 --- a/webrtc/modules/audio_device/test/func_test_manager.h +++ b/webrtc/modules/audio_device/test/func_test_manager.h @@ -11,16 +11,16 @@ #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H #define WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H -#include "modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" #include <string> -#include "typedefs.h" -#include "audio_device.h" -#include "audio_device_test_defines.h" -#include "file_wrapper.h" -#include "list_wrapper.h" -#include "resampler.h" +#include "webrtc/common_audio/resampler/include/resampler.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/modules/audio_device/test/audio_device_test_defines.h" +#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/interface/list_wrapper.h" +#include "webrtc/typedefs.h" #if defined(WEBRTC_IOS) || defined(ANDROID) #define USE_SLEEP_AS_PAUSE diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.cc b/webrtc/modules/audio_device/win/audio_device_core_win.cc index 349dfc7786..a71b821189 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_core_win.cc @@ -18,7 +18,7 @@ #pragma message(">> INFO: Windows Core Audio is not supported in VS 2003") #endif -#include "audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_config.h" #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) #pragma message(">> INFO: WEBRTC_WINDOWS_CORE_AUDIO_BUILD is defined") @@ -28,7 +28,7 @@ #ifdef WEBRTC_WINDOWS_CORE_AUDIO_BUILD -#include "audio_device_core_win.h" +#include "webrtc/modules/audio_device/win/audio_device_core_win.h" #include <assert.h> #include <string.h> @@ -36,14 +36,14 @@ #include <windows.h> #include <comdef.h> #include <dmo.h> -#include "Functiondiscoverykeys_devpkey.h" +#include <Functiondiscoverykeys_devpkey.h> #include <mmsystem.h> #include <strsafe.h> #include <uuids.h> -#include "audio_device_utility.h" -#include "system_wrappers/interface/sleep.h" -#include "trace.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/interface/trace.h" // Macro that calls a COM method returning HRESULT value. #define EXIT_ON_ERROR(hres) do { if (FAILED(hres)) goto Exit; } while(0) diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.h b/webrtc/modules/audio_device/win/audio_device_core_win.h index b1efec42cc..7a9a5245ca 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.h +++ b/webrtc/modules/audio_device/win/audio_device_core_win.h @@ -13,19 +13,19 @@ #if (_MSC_VER >= 1400) // only include for VS 2005 and higher -#include "audio_device_generic.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" #include <wmcodecdsp.h> // CLSID_CWMAudioAEC // (must be before audioclient.h) #include <Audioclient.h> // WASAPI #include <Audiopolicy.h> +#include <Mmdeviceapi.h> // MMDevice #include <avrt.h> // Avrt #include <endpointvolume.h> #include <mediaobj.h> // IMediaObject -#include <Mmdeviceapi.h> // MMDevice -#include "critical_section_wrapper.h" -#include "scoped_refptr.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/scoped_refptr.h" // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority #pragma comment( lib, "avrt.lib" ) diff --git a/webrtc/modules/audio_device/win/audio_device_utility_win.cc b/webrtc/modules/audio_device/win/audio_device_utility_win.cc index abbbc373c6..0d0655b21c 100644 --- a/webrtc/modules/audio_device/win/audio_device_utility_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_utility_win.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_utility_win.h" -#include "audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/win/audio_device_utility_win.h" -#include "critical_section_wrapper.h" -#include "trace.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" #include <windows.h> #include <tchar.h> diff --git a/webrtc/modules/audio_device/win/audio_device_utility_win.h b/webrtc/modules/audio_device/win/audio_device_utility_win.h index b483a61d16..9f836eef1e 100644 --- a/webrtc/modules/audio_device/win/audio_device_utility_win.h +++ b/webrtc/modules/audio_device/win/audio_device_utility_win.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_WIN_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_WIN_H -#include "audio_device_utility.h" -#include "audio_device.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/include/audio_device.h" #include <windows.h> namespace webrtc diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.cc b/webrtc/modules/audio_device/win/audio_device_wave_win.cc index 7a5cd69fa3..6efd6e1d77 100644 --- a/webrtc/modules/audio_device/win/audio_device_wave_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_wave_win.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_device_utility.h" -#include "audio_device_wave_win.h" -#include "audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_config.h" +#include "webrtc/modules/audio_device/audio_device_utility.h" +#include "webrtc/modules/audio_device/win/audio_device_wave_win.h" -#include "trace.h" -#include "thread_wrapper.h" -#include "event_wrapper.h" +#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/interface/trace.h" #include <windows.h> #include <objbase.h> // CoTaskMemAlloc, CoTaskMemFree @@ -3833,4 +3833,3 @@ bool AudioDeviceWindowsWave::KeyPressed() const{ return (key_down > 0); } } // namespace webrtc - diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.h b/webrtc/modules/audio_device/win/audio_device_wave_win.h index 161a30690e..480bbcbc77 100644 --- a/webrtc/modules/audio_device/win/audio_device_wave_win.h +++ b/webrtc/modules/audio_device/win/audio_device_wave_win.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H -#include "audio_device_generic.h" -#include "audio_mixer_manager_win.h" +#include "webrtc/modules/audio_device/audio_device_generic.h" +#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h" #pragma comment( lib, "winmm.lib" ) diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc index 0c4b01e446..80f43cdf3a 100644 --- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc +++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "audio_mixer_manager_win.h" -#include "trace.h" +#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h" +#include "webrtc/system_wrappers/interface/trace.h" -#include <strsafe.h> // StringCchCopy(), StringCchCat(), StringCchPrintf() #include <cassert> // assert() +#include <strsafe.h> // StringCchCopy(), StringCchCat(), StringCchPrintf() #ifdef _WIN32 // removes warning: "reinterpret_cast: conversion from 'UINT' to 'HMIXEROBJ' diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.h b/webrtc/modules/audio_device/win/audio_mixer_manager_win.h index fc507c4c08..52b46e0201 100644 --- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.h +++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_WIN_H #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_WIN_H -#include "typedefs.h" -#include "audio_device.h" -#include "critical_section_wrapper.h" +#include "webrtc/typedefs.h" +#include "webrtc/modules/audio_device/include/audio_device.h" +#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include <Windows.h> #include <mmsystem.h> |