[Android] jni: myVm can now be static
Thomas Guillem
git at videolan.org
Thu Oct 16 12:13:34 CEST 2014
vlc-ports/android | branch: tv | Thomas Guillem <tom at gllm.fr> | Tue Oct 14 11:35:39 2014 +0200| [6b39db57ca779309f7df3361ff8c7a3fcbe470d2] | committer: Geoffrey Métais
jni: myVm can now be static
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=6b39db57ca779309f7df3361ff8c7a3fcbe470d2
---
vlc-android/jni/libvlcjni-medialist.c | 3 ---
vlc-android/jni/libvlcjni.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/vlc-android/jni/libvlcjni-medialist.c b/vlc-android/jni/libvlcjni-medialist.c
index f782f96..257fadc 100644
--- a/vlc-android/jni/libvlcjni-medialist.c
+++ b/vlc-android/jni/libvlcjni-medialist.c
@@ -28,9 +28,6 @@
#define LOG_TAG "VLC/JNI/MediaList"
#include "log.h"
-/** Unique Java VM instance, as defined in libvlcjni.c */
-extern JavaVM *myVm;
-
struct stopped_monitor {
pthread_mutex_t doneMutex;
pthread_cond_t doneCondVar;
diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index bfa9a8a..fc191d2 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -115,7 +115,7 @@ static void releaseMediaPlayer(JNIEnv *env, jobject thiz)
* Note: It's okay to use a static variable for the VM pointer since there
* can only be one instance of this shared library in a single VM
*/
-JavaVM *myVm;
+static JavaVM *myVm;
static jobject eventHandlerInstance = NULL;
More information about the Android
mailing list