From b9d7d934deef2faafc6e0901d0891c93ca73b350 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 25 Jan 2012 19:21:13 +0000 Subject: [PATCH] Rename interface/ to include/ in audio_processing. BUG=none TEST=build on Linux. Review URL: https://webrtc-codereview.appspot.com/367007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1552 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_conference_mixer/source/Android.mk | 6 +++--- src/modules/audio_processing/Android.mk | 16 ++++++++-------- src/modules/audio_processing/aec/Android.mk | 4 ++-- src/modules/audio_processing/aec/aec.gypi | 8 ++++---- .../{interface => include}/echo_cancellation.h | 2 +- src/modules/audio_processing/aecm/Android.mk | 6 +++--- src/modules/audio_processing/aecm/aecm.gypi | 8 ++++---- .../{interface => include}/echo_control_mobile.h | 2 +- src/modules/audio_processing/agc/Android.mk | 4 ++-- src/modules/audio_processing/agc/agc.gypi | 8 ++++---- .../agc/{interface => include}/gain_control.h | 2 +- .../audio_processing/audio_processing.gypi | 8 ++++---- .../{interface => include}/audio_processing.h | 0 src/modules/audio_processing/ns/Android.mk | 6 +++--- .../{interface => include}/noise_suppression.h | 2 +- .../{interface => include}/noise_suppression_x.h | 2 +- src/modules/audio_processing/ns/ns.gypi | 14 +++++++------- src/voice_engine/main/source/Android.mk | 4 ++-- 18 files changed, 51 insertions(+), 51 deletions(-) rename src/modules/audio_processing/aec/{interface => include}/echo_cancellation.h (99%) rename src/modules/audio_processing/aecm/{interface => include}/echo_control_mobile.h (99%) rename src/modules/audio_processing/agc/{interface => include}/gain_control.h (99%) rename src/modules/audio_processing/{interface => include}/audio_processing.h (100%) rename src/modules/audio_processing/ns/{interface => include}/noise_suppression.h (98%) rename src/modules/audio_processing/ns/{interface => include}/noise_suppression_x.h (98%) diff --git a/src/modules/audio_conference_mixer/source/Android.mk b/src/modules/audio_conference_mixer/source/Android.mk index ead9d0f28..a90ff1dc4 100644 --- a/src/modules/audio_conference_mixer/source/Android.mk +++ b/src/modules/audio_conference_mixer/source/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -29,9 +29,9 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../../interface \ - $(LOCAL_PATH)/../../audio_processing/interface \ + $(LOCAL_PATH)/../../audio_processing/include \ $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../../../system_wrappers/interface + $(LOCAL_PATH)/../../../system_wrappers/interface LOCAL_SHARED_LIBRARIES := \ libcutils \ diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index 9ca2aeedf..2ab5bb627 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -38,11 +38,11 @@ LOCAL_CFLAGS := \ # -DWEBRTC_NS_FLOAT' LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ - $(LOCAL_PATH)/aec/interface \ - $(LOCAL_PATH)/aecm/interface \ - $(LOCAL_PATH)/agc/interface \ - $(LOCAL_PATH)/ns/interface \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/aec/include \ + $(LOCAL_PATH)/aecm/include \ + $(LOCAL_PATH)/agc/include \ + $(LOCAL_PATH)/ns/include \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../../common_audio/signal_processing/include \ @@ -75,7 +75,7 @@ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../../system_wrappers/interface \ @@ -116,7 +116,7 @@ LOCAL_CFLAGS := \ '-DWEBRTC_APM_UNIT_TEST_FIXED_PROFILE' LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../../../test \ diff --git a/src/modules/audio_processing/aec/Android.mk b/src/modules/audio_processing/aec/Android.mk index 7d539587b..26679d8a2 100644 --- a/src/modules/audio_processing/aec/Android.mk +++ b/src/modules/audio_processing/aec/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -32,7 +32,7 @@ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../utility \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include diff --git a/src/modules/audio_processing/aec/aec.gypi b/src/modules/audio_processing/aec/aec.gypi index 4b3a08d95..ed333aed9 100644 --- a/src/modules/audio_processing/aec/aec.gypi +++ b/src/modules/audio_processing/aec/aec.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -20,15 +20,15 @@ '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing', ], 'include_dirs': [ - 'interface', + 'include', ], 'direct_dependent_settings': { 'include_dirs': [ - 'interface', + 'include', ], }, 'sources': [ - 'interface/echo_cancellation.h', + 'include/echo_cancellation.h', 'echo_cancellation.c', 'aec_core.h', 'aec_core.c', diff --git a/src/modules/audio_processing/aec/interface/echo_cancellation.h b/src/modules/audio_processing/aec/include/echo_cancellation.h similarity index 99% rename from src/modules/audio_processing/aec/interface/echo_cancellation.h rename to src/modules/audio_processing/aec/include/echo_cancellation.h index 4da6e731a..f2f887b6d 100644 --- a/src/modules/audio_processing/aec/interface/echo_cancellation.h +++ b/src/modules/audio_processing/aec/include/echo_cancellation.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk index 10c38ca50..2d64b85c5 100644 --- a/src/modules/audio_processing/aecm/Android.mk +++ b/src/modules/audio_processing/aecm/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../utility \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include \ @@ -66,7 +66,7 @@ LOCAL_CFLAGS := \ -flax-vector-conversions LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include diff --git a/src/modules/audio_processing/aecm/aecm.gypi b/src/modules/audio_processing/aecm/aecm.gypi index bf520bfe0..3e4a113f7 100644 --- a/src/modules/audio_processing/aecm/aecm.gypi +++ b/src/modules/audio_processing/aecm/aecm.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -17,15 +17,15 @@ 'apm_util' ], 'include_dirs': [ - 'interface', + 'include', ], 'direct_dependent_settings': { 'include_dirs': [ - 'interface', + 'include', ], }, 'sources': [ - 'interface/echo_control_mobile.h', + 'include/echo_control_mobile.h', 'echo_control_mobile.c', 'aecm_core.c', 'aecm_core.h', diff --git a/src/modules/audio_processing/aecm/interface/echo_control_mobile.h b/src/modules/audio_processing/aecm/include/echo_control_mobile.h similarity index 99% rename from src/modules/audio_processing/aecm/interface/echo_control_mobile.h rename to src/modules/audio_processing/aecm/include/echo_control_mobile.h index 30bea7ab4..063ad29fe 100644 --- a/src/modules/audio_processing/aecm/interface/echo_control_mobile.h +++ b/src/modules/audio_processing/aecm/include/echo_control_mobile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source diff --git a/src/modules/audio_processing/agc/Android.mk b/src/modules/audio_processing/agc/Android.mk index 546128d45..5eceb1405 100644 --- a/src/modules/audio_processing/agc/Android.mk +++ b/src/modules/audio_processing/agc/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -25,7 +25,7 @@ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include diff --git a/src/modules/audio_processing/agc/agc.gypi b/src/modules/audio_processing/agc/agc.gypi index 78288b7bb..f96f237c6 100644 --- a/src/modules/audio_processing/agc/agc.gypi +++ b/src/modules/audio_processing/agc/agc.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -15,15 +15,15 @@ '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing', ], 'include_dirs': [ - 'interface', + 'include', ], 'direct_dependent_settings': { 'include_dirs': [ - 'interface', + 'include', ], }, 'sources': [ - 'interface/gain_control.h', + 'include/gain_control.h', 'analog_agc.c', 'analog_agc.h', 'digital_agc.c', diff --git a/src/modules/audio_processing/agc/interface/gain_control.h b/src/modules/audio_processing/agc/include/gain_control.h similarity index 99% rename from src/modules/audio_processing/agc/interface/gain_control.h rename to src/modules/audio_processing/agc/include/gain_control.h index 2893331fa..5ba619ac5 100644 --- a/src/modules/audio_processing/agc/interface/gain_control.h +++ b/src/modules/audio_processing/agc/include/gain_control.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source diff --git a/src/modules/audio_processing/audio_processing.gypi b/src/modules/audio_processing/audio_processing.gypi index 2a22a796f..00078c4c6 100644 --- a/src/modules/audio_processing/audio_processing.gypi +++ b/src/modules/audio_processing/audio_processing.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -33,17 +33,17 @@ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ - 'interface', + 'include', '../interface', ], 'direct_dependent_settings': { 'include_dirs': [ - 'interface', + 'include', '../interface', ], }, 'sources': [ - 'interface/audio_processing.h', + 'include/audio_processing.h', 'audio_buffer.cc', 'audio_buffer.h', 'audio_processing_impl.cc', diff --git a/src/modules/audio_processing/interface/audio_processing.h b/src/modules/audio_processing/include/audio_processing.h similarity index 100% rename from src/modules/audio_processing/interface/audio_processing.h rename to src/modules/audio_processing/include/audio_processing.h diff --git a/src/modules/audio_processing/ns/Android.mk b/src/modules/audio_processing/ns/Android.mk index 255f4709c..5e442f638 100644 --- a/src/modules/audio_processing/ns/Android.mk +++ b/src/modules/audio_processing/ns/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -29,7 +29,7 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../utility \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include \ @@ -68,7 +68,7 @@ LOCAL_CFLAGS := \ -flax-vector-conversions LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/interface \ + $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../common_audio/signal_processing/include diff --git a/src/modules/audio_processing/ns/interface/noise_suppression.h b/src/modules/audio_processing/ns/include/noise_suppression.h similarity index 98% rename from src/modules/audio_processing/ns/interface/noise_suppression.h rename to src/modules/audio_processing/ns/include/noise_suppression.h index 907faf4bf..c8de9d12f 100644 --- a/src/modules/audio_processing/ns/interface/noise_suppression.h +++ b/src/modules/audio_processing/ns/include/noise_suppression.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source diff --git a/src/modules/audio_processing/ns/interface/noise_suppression_x.h b/src/modules/audio_processing/ns/include/noise_suppression_x.h similarity index 98% rename from src/modules/audio_processing/ns/interface/noise_suppression_x.h rename to src/modules/audio_processing/ns/include/noise_suppression_x.h index 14443fa37..874593684 100644 --- a/src/modules/audio_processing/ns/interface/noise_suppression_x.h +++ b/src/modules/audio_processing/ns/include/noise_suppression_x.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source diff --git a/src/modules/audio_processing/ns/ns.gypi b/src/modules/audio_processing/ns/ns.gypi index 3e3d2e141..147f7ead5 100644 --- a/src/modules/audio_processing/ns/ns.gypi +++ b/src/modules/audio_processing/ns/ns.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -16,15 +16,15 @@ 'apm_util' ], 'include_dirs': [ - 'interface', + 'include', ], 'direct_dependent_settings': { 'include_dirs': [ - 'interface', + 'include', ], }, 'sources': [ - 'interface/noise_suppression.h', + 'include/noise_suppression.h', 'noise_suppression.c', 'windows_private.h', 'defines.h', @@ -40,15 +40,15 @@ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ - 'interface', + 'include', ], 'direct_dependent_settings': { 'include_dirs': [ - 'interface', + 'include', ], }, 'sources': [ - 'interface/noise_suppression_x.h', + 'include/noise_suppression_x.h', 'noise_suppression_x.c', 'nsx_defines.h', 'nsx_core.c', diff --git a/src/voice_engine/main/source/Android.mk b/src/voice_engine/main/source/Android.mk index c7e2adcdd..5040f17af 100644 --- a/src/voice_engine/main/source/Android.mk +++ b/src/voice_engine/main/source/Android.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license # that can be found in the LICENSE file in the root of the source @@ -62,7 +62,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../../modules/audio_conference_mixer/interface \ $(LOCAL_PATH)/../../../modules/audio_device/main/interface \ $(LOCAL_PATH)/../../../modules/audio_device/main/source \ - $(LOCAL_PATH)/../../../modules/audio_processing/interface \ + $(LOCAL_PATH)/../../../modules/audio_processing/include \ $(LOCAL_PATH)/../../../modules/media_file/interface \ $(LOCAL_PATH)/../../../modules/rtp_rtcp/interface \ $(LOCAL_PATH)/../../../modules/udp_transport/interface \