From 2a84f63719e1db5e42aebec8ad11ea6c16678be5 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Wed, 3 Oct 2012 21:40:06 +0000 Subject: [PATCH] Rename android file name Rename file name to follow code style. BUG=None TEST=trybots Review URL: https://webrtc-codereview.appspot.com/867004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2869 4adac7df-926f-26a2-2b94-8c16560cd09d --- ..._device_android_jni.cc => audio_device_jni_android.cc} | 2 +- ...io_device_android_jni.h => audio_device_jni_android.h} | 6 +++--- ...droid_opensles.cc => audio_device_opensles_android.cc} | 2 +- ...android_opensles.h => audio_device_opensles_android.h} | 6 +++--- src/modules/audio_device/audio_device.gypi | 8 ++++---- src/modules/audio_device/audio_device_impl.cc | 4 ++-- src/voice_engine/voice_engine_impl.cc | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) rename src/modules/audio_device/android/{audio_device_android_jni.cc => audio_device_jni_android.cc} (99%) rename src/modules/audio_device/android/{audio_device_android_jni.h => audio_device_jni_android.h} (98%) rename src/modules/audio_device/android/{audio_device_android_opensles.cc => audio_device_opensles_android.cc} (99%) rename src/modules/audio_device/android/{audio_device_android_opensles.h => audio_device_opensles_android.h} (98%) diff --git a/src/modules/audio_device/android/audio_device_android_jni.cc b/src/modules/audio_device/android/audio_device_jni_android.cc similarity index 99% rename from src/modules/audio_device/android/audio_device_android_jni.cc rename to src/modules/audio_device/android/audio_device_jni_android.cc index 9f48c40eb7..5934b287a8 100644 --- a/src/modules/audio_device/android/audio_device_android_jni.cc +++ b/src/modules/audio_device/android/audio_device_jni_android.cc @@ -19,7 +19,7 @@ #include #include "audio_device_utility.h" -#include "audio_device_android_jni.h" +#include "audio_device_jni_android.h" #include "audio_device_config.h" #include "trace.h" diff --git a/src/modules/audio_device/android/audio_device_android_jni.h b/src/modules/audio_device/android/audio_device_jni_android.h similarity index 98% rename from src/modules/audio_device/android/audio_device_android_jni.h rename to src/modules/audio_device/android/audio_device_jni_android.h index 1e292e3035..b8ea7451cf 100644 --- a/src/modules/audio_device/android/audio_device_android_jni.h +++ b/src/modules/audio_device/android/audio_device_jni_android.h @@ -12,8 +12,8 @@ * Android audio device interface (JNI/AudioTrack/AudioRecord usage) */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ANDROID_JNI_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ANDROID_JNI_H +#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" @@ -270,4 +270,4 @@ class AudioDeviceAndroidJni : public AudioDeviceGeneric { } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ANDROID_JNI_H +#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H diff --git a/src/modules/audio_device/android/audio_device_android_opensles.cc b/src/modules/audio_device/android/audio_device_opensles_android.cc similarity index 99% rename from src/modules/audio_device/android/audio_device_android_opensles.cc rename to src/modules/audio_device/android/audio_device_opensles_android.cc index f383c79eda..8d8e1f3fe2 100644 --- a/src/modules/audio_device/android/audio_device_android_opensles.cc +++ b/src/modules/audio_device/android/audio_device_opensles_android.cc @@ -14,7 +14,7 @@ #include #include "audio_device_utility.h" -#include "audio_device_android_opensles.h" +#include "audio_device_opensles_android.h" #include "audio_device_config.h" #include "trace.h" diff --git a/src/modules/audio_device/android/audio_device_android_opensles.h b/src/modules/audio_device/android/audio_device_opensles_android.h similarity index 98% rename from src/modules/audio_device/android/audio_device_android_opensles.h rename to src/modules/audio_device/android/audio_device_opensles_android.h index fc0e0a17d6..fabdc124fb 100644 --- a/src/modules/audio_device/android/audio_device_android_opensles.h +++ b/src/modules/audio_device/android/audio_device_opensles_android.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ANDROID_OPENSLES_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ANDROID_OPENSLES_H +#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_OPENSLES_ANDROID_H +#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_OPENSLES_ANDROID_H #include "audio_device_generic.h" #include "critical_section_wrapper.h" @@ -313,4 +313,4 @@ private: } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ANDROID_OPENSLES_H +#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_OPENSLES_ANDROID_H diff --git a/src/modules/audio_device/audio_device.gypi b/src/modules/audio_device/audio_device.gypi index b8f77ea4b2..640f732c30 100644 --- a/src/modules/audio_device/audio_device.gypi +++ b/src/modules/audio_device/audio_device.gypi @@ -122,13 +122,13 @@ 'conditions': [ ['enable_android_opensl==1', { 'sources': [ - 'android/audio_device_android_opensles.cc', - 'android/audio_device_android_opensles.h', + 'android/audio_device_opensles_android.cc', + 'android/audio_device_opensles_android.h', ], }, { 'sources': [ - 'android/audio_device_android_jni.cc', - 'android/audio_device_android_jni.h', + 'android/audio_device_jni_android.cc', + 'android/audio_device_jni_android.h', ], }], ], diff --git a/src/modules/audio_device/audio_device_impl.cc b/src/modules/audio_device/audio_device_impl.cc index fef1cbc515..87f8211751 100644 --- a/src/modules/audio_device/audio_device_impl.cc +++ b/src/modules/audio_device/audio_device_impl.cc @@ -25,11 +25,11 @@ #elif defined(WEBRTC_ANDROID_OPENSLES) #include #include "audio_device_utility_android.h" - #include "audio_device_android_opensles.h" + #include "audio_device_opensles_android.h" #elif defined(WEBRTC_ANDROID) #include #include "audio_device_utility_android.h" - #include "audio_device_android_jni.h" + #include "audio_device_jni_android.h" #elif defined(WEBRTC_LINUX) #include "audio_device_utility_linux.h" #if defined(LINUX_ALSA) diff --git a/src/voice_engine/voice_engine_impl.cc b/src/voice_engine/voice_engine_impl.cc index f90869f4d4..18f841c296 100644 --- a/src/voice_engine/voice_engine_impl.cc +++ b/src/voice_engine/voice_engine_impl.cc @@ -9,7 +9,7 @@ */ #if defined(WEBRTC_ANDROID) && !defined(WEBRTC_ANDROID_OPENSLES) -#include "modules/audio_device/android/audio_device_android_jni.h" +#include "modules/audio_device/android/audio_device_jni_android.h" #endif #include "voice_engine_impl.h"