[Android] jni: Store pointers in Long

[Edward Wang]

vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Aug 22 17:15:04 2012 -0400| [414eede169d8acf76f8fb671c8f61f9c59ba7405] | committer: Jean-Baptiste Kempf

jni: Store pointers in Long

64-bit compatibility, etc, ...

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=414eede169d8acf76f8fb671c8f61f9c59ba7405
---

 vlc-android/jni/libvlcjni.c                  |   25 ++++++-------------------
 vlc-android/src/org/videolan/vlc/LibVLC.java |    4 ++--
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index 9c14c76..c0d98ee 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -172,18 +172,12 @@ libvlc_media_t *new_media(jint instance, JNIEnv *env, jobject thiz, jstring file
 
 static libvlc_media_player_t *getMediaPlayer(JNIEnv *env, jobject thiz)
 {
-    jclass clazz = (*env)->GetObjectClass(env, thiz);
-    jfieldID fieldMP = (*env)->GetFieldID(env, clazz,
-                                          "mMediaPlayerInstance", "I");
-    return (libvlc_media_player_t*)(*env)->GetIntField(env, thiz, fieldMP);
+    return (libvlc_media_player_t*)getLong(env, thiz, "mMediaPlayerInstance");
 }
 
 static void unsetMediaPlayer(JNIEnv *env, jobject thiz)
 {
-    jclass clazz = (*env)->GetObjectClass(env, thiz);
-    jfieldID fieldMP = (*env)->GetFieldID(env, clazz,
-                                          "mMediaPlayerInstance", "I");
-    (*env)->SetIntField(env, thiz, fieldMP, 0);
+    setLong(env, thiz, "mMediaPlayerInstance", (jlong)0);
 }
 
 static void releaseMediaPlayer(JNIEnv *env, jobject thiz)
@@ -385,9 +379,7 @@ void Java_org_videolan_vlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz, jboolean
     };
     libvlc_instance_t *instance = libvlc_new(sizeof(argv) / sizeof(*argv), argv);
 
-    jclass clazz = (*env)->GetObjectClass(env, thiz);
-    jfieldID field = (*env)->GetFieldID(env, clazz, "mLibVlcInstance", "I");
-    (*env)->SetIntField(env, thiz, field, (jint) instance);
+    setLong(env, thiz, "mLibVlcInstance", (jlong) instance);
 
     if (!instance)
     {
@@ -420,9 +412,7 @@ jstring Java_org_videolan_vlc_LibVLC_nativeToURI(JNIEnv *env, jobject thiz, jstr
 void Java_org_videolan_vlc_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
 {
     releaseMediaPlayer(env, thiz);
-    jclass clazz = (*env)->GetObjectClass(env, thiz);
-    jfieldID field = (*env)->GetFieldID(env, clazz, "mLibVlcInstance", "I");
-    jint libVlcInstance = (*env)->GetIntField(env, thiz, field);
+    jlong libVlcInstance = getLong(env, thiz, "mLibVlcInstance");
     if (!libVlcInstance)
         return; // Already destroyed
 
@@ -430,7 +420,7 @@ void Java_org_videolan_vlc_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
     libvlc_release(instance);
     libvlc_log_unsubscribe(&debug_subscriber);
 
-    (*env)->SetIntField(env, thiz, field, 0);
+    setLong(env, thiz, "mLibVlcInstance", 0);
 }
 
 void Java_org_videolan_vlc_LibVLC_detachEventManager(JNIEnv *env, jobject thiz)
@@ -553,10 +543,7 @@ void Java_org_videolan_vlc_LibVLC_readMedia(JNIEnv *env, jobject thiz,
         libvlc_event_attach(ev, mp_events[i], vlc_event_callback, myVm);
 
     /* Keep a pointer to this media player */
-    jclass clazz = (*env)->GetObjectClass(env, thiz);
-    jfieldID field = (*env)->GetFieldID(env, clazz,
-                                        "mMediaPlayerInstance", "I");
-    (*env)->SetIntField(env, thiz, field, (jint) mp);
+    setLong(env, thiz, "mMediaPlayerInstance", (jlong) mp);
 
     libvlc_media_player_play(mp);
 }
diff --git a/vlc-android/src/org/videolan/vlc/LibVLC.java b/vlc-android/src/org/videolan/vlc/LibVLC.java
index 98ac2db..10dcdcd 100644
--- a/vlc-android/src/org/videolan/vlc/LibVLC.java
+++ b/vlc-android/src/org/videolan/vlc/LibVLC.java
@@ -44,8 +44,8 @@ public class LibVLC {
     private static int sAout = AOUT_AUDIOTRACK;
 
     /** libVLC instance C pointer */
-    private int mLibVlcInstance = 0; // Read-only, reserved for JNI
-    private int mMediaPlayerInstance = 0; // Read-only, reserved for JNI
+    private long mLibVlcInstance = 0; // Read-only, reserved for JNI
+    private long mMediaPlayerInstance = 0; // Read-only, reserved for JNI
 
     private Aout mAout;