admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename android file name

Browse Source 
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
This commit is contained in:
leozwang@webrtc.org 2012-10-03 21:40:06 +00:00
parent 0a4cdc40fc
commit 2a84f63719
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/audio_device/android/audio_device_android_jni.cc → src/modules/audio_device/android/audio_device_jni_android.cc
View File

@ -19,7 +19,7 @@
#include <stdlib.h>
#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"

6
src/modules/audio_device/android/audio_device_android_jni.h → src/modules/audio_device/android/audio_device_jni_android.h
View File

@ -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

2
src/modules/audio_device/android/audio_device_android_opensles.cc → src/modules/audio_device/android/audio_device_opensles_android.cc
View File

@ -14,7 +14,7 @@
#include <time.h>
#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"

6
src/modules/audio_device/android/audio_device_android_opensles.h → src/modules/audio_device/android/audio_device_opensles_android.h
View File

@ -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

8
src/modules/audio_device/audio_device.gypi
View File

@ -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',
],
}],
],

4
src/modules/audio_device/audio_device_impl.cc
View File

@ -25,11 +25,11 @@
#elif defined(WEBRTC_ANDROID_OPENSLES)
#include <stdlib.h>
#include "audio_device_utility_android.h"
#include "audio_device_android_opensles.h"
#include "audio_device_opensles_android.h"
#elif defined(WEBRTC_ANDROID)
#include <stdlib.h>
#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)

2
src/voice_engine/voice_engine_impl.cc
View File

@ -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"