[Android] [PATCH 2/2] Removed trailing tabs. Fix ticket #10831 (https://trac.videolan.org/vlc/ticket/10831).

Paulo Vitor Magacho da Silva pvmagacho at gmail.com
Wed Jul 23 08:43:39 CEST 2014


---
 vlc-android/jni/libvlcjni.c | 18 +++++++++---------
 vlc-android/jni/utils.h     | 14 +++++++-------
 vlc-android/jni/vout.c      | 10 +++++-----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index fa9b6ad..3670f86 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -213,12 +213,12 @@ static bool verbosity;
 
 void Java_org_videolan_libvlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
 {
-	vlc_object *object = (vlc_object *) malloc(sizeof(vlc_object));
+    vlc_object *object = (vlc_object *) malloc(sizeof(vlc_object));
 
-	pthread_mutex_init(&object->vout_android_lock, NULL);
-	pthread_cond_init(&object->vout_android_surf_attached, NULL);
+    pthread_mutex_init(&object->vout_android_lock, NULL);
+    pthread_cond_init(&object->vout_android_surf_attached, NULL);
 
-	setLong(env, thiz, "mVLCObject", (jlong)(intptr_t)object);
+    setLong(env, thiz, "mVLCObject", (jlong)(intptr_t)object);
 
     //only use OpenSLES if java side says we can
     jclass cls = (*env)->GetObjectClass(env, thiz);
@@ -327,15 +327,15 @@ void Java_org_videolan_libvlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
 void Java_org_videolan_libvlc_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
 {
     // clear surface lock and condition
-	vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
+    vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
 
     pthread_mutex_destroy(&object->vout_android_lock);
-	pthread_cond_destroy(&object->vout_android_surf_attached);
+    pthread_cond_destroy(&object->vout_android_surf_attached);
 
-	free(object);
-	setLong(env, thiz, "mVLCObject", 0);
+    free(object);
+    setLong(env, thiz, "mVLCObject", 0);
 
-	destroy_native_crash_handler(env);
+    destroy_native_crash_handler(env);
 
     releaseMediaPlayer(env, thiz);
     jlong libVlcInstance = getLong(env, thiz, "mLibVlcInstance");
diff --git a/vlc-android/jni/utils.h b/vlc-android/jni/utils.h
index eab61da..15243fe 100644
--- a/vlc-android/jni/utils.h
+++ b/vlc-android/jni/utils.h
@@ -24,13 +24,13 @@
 #include <pthread.h>
 
 typedef struct vlc_object {
-	pthread_mutex_t vout_android_lock;
-	pthread_cond_t vout_android_surf_attached;
-	void *vout_android_surf;
-	void *vout_android_gui;
-	jobject vout_android_java_surf;
-	jobject vout_android_subtitles_surf;
-	bool vout_video_player_activity_created;
+    pthread_mutex_t vout_android_lock;
+    pthread_cond_t vout_android_surf_attached;
+    void *vout_android_surf;
+    void *vout_android_gui;
+    jobject vout_android_java_surf;
+    jobject vout_android_subtitles_surf;
+    bool vout_video_player_activity_created;
 } vlc_object;
 
 libvlc_media_t *new_media(jlong instance, JNIEnv *env, jobject thiz, jstring fileLocation, bool noOmx, bool noVideo);
diff --git a/vlc-android/jni/vout.c b/vlc-android/jni/vout.c
index cd13a6b..b9b792f 100644
--- a/vlc-android/jni/vout.c
+++ b/vlc-android/jni/vout.c
@@ -100,7 +100,7 @@ bool jni_IsVideoPlayerActivityCreated(vlc_object *object) {
 }
 
 void Java_org_videolan_libvlc_LibVLC_eventVideoPlayerActivityCreated(JNIEnv *env, jobject thiz, jboolean created) {
-	vlc_object * object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
+    vlc_object * object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
 
     pthread_mutex_lock(&object->vout_android_lock);
     object->vout_video_player_activity_created = created;
@@ -108,7 +108,7 @@ void Java_org_videolan_libvlc_LibVLC_eventVideoPlayerActivityCreated(JNIEnv *env
 }
 
 void Java_org_videolan_libvlc_LibVLC_attachSurface(JNIEnv *env, jobject thiz, jobject surf, jobject gui) {
-	vlc_object * object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
+    vlc_object * object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
 
     pthread_mutex_lock(&object->vout_android_lock);
     jclass clz;
@@ -139,7 +139,7 @@ void Java_org_videolan_libvlc_LibVLC_attachSurface(JNIEnv *env, jobject thiz, jo
 }
 
 void Java_org_videolan_libvlc_LibVLC_detachSurface(JNIEnv *env, jobject thiz) {
-	vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
+    vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
 
     pthread_mutex_lock(&object->vout_android_lock);
     object->vout_android_surf = NULL;
@@ -153,7 +153,7 @@ void Java_org_videolan_libvlc_LibVLC_detachSurface(JNIEnv *env, jobject thiz) {
 }
 
 void Java_org_videolan_libvlc_LibVLC_attachSubtitlesSurface(JNIEnv *env, jobject thiz, jobject surf) {
-	vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
+    vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
 
     pthread_mutex_lock(&object->vout_android_lock);
     object->vout_android_subtitles_surf = (*env)->NewGlobalRef(env, surf);
@@ -162,7 +162,7 @@ void Java_org_videolan_libvlc_LibVLC_attachSubtitlesSurface(JNIEnv *env, jobject
 }
 
 void Java_org_videolan_libvlc_LibVLC_detachSubtitlesSurface(JNIEnv *env, jobject thiz) {
-	vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
+    vlc_object *object = (vlc_object *)(intptr_t)getLong(env, thiz, "mVLCObject");
 
     pthread_mutex_lock(&object->vout_android_lock);
     (*env)->DeleteGlobalRef(env, object->vout_android_subtitles_surf);
-- 
1.8.5.2 (Apple Git-48)



More information about the Android mailing list