Java bindings update: various enhancements; paint system changed; reparenting works...

[vlc] / bindings / java / src / core-jni.cc

diff --git a/bindings/java/src/core-jni.cc b/bindings/java/src/core-jni.cc
index 43fa26fbdd12773a5c003678f79093af6147fcdd..4266f7ff1b6f014e9f8989331dd9492eadc9b138 100644 (file)
--- a/bindings/java/src/core-jni.cc
+++ b/bindings/java/src/core-jni.cc
@@ -38,8 +38,6 @@
 #include <jawt.h>
 #include <jawt_md.h>
 
-#include <X11/Xlib.h> // for Xlibs graphics functions
-
 #include "utils.h"
 
 
@@ -55,14 +53,11 @@ JNIEXPORT jlong JNICALL Java_org_videolan_jvlc_JVLC_createInstance (JNIEnv *env,
 
     libvlc_exception_init( exception );
   
-    argc = (int) env->GetArrayLength((jarray) args) + 1;
+    argc = (int) env->GetArrayLength((jarray) args);
     argv = (const char **) malloc(argc * sizeof(char*));
 
-    argv[0] = "vlc";
-    
-    
-    for (int i = 0; i < argc - 1; i++) {
-        argv[i+1] = env->GetStringUTFChars((jstring) env->GetObjectArrayElement(args, i),
+    for (int i = 0; i < argc; i++) {
+        argv[i] = env->GetStringUTFChars((jstring) env->GetObjectArrayElement(args, i),
                                          0
         );
     }
@@ -70,8 +65,7 @@ JNIEXPORT jlong JNICALL Java_org_videolan_jvlc_JVLC_createInstance (JNIEnv *env,
     res = (long) libvlc_new(argc, (char**) argv, exception );
 
     free( exception );
-    free( argv );
-
+ 
     return res;
 
 }
@@ -88,6 +82,9 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLC__1destroy (JNIEnv *env, jobje
 }
 
 
+//JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLC__1paint (JNIEnv *env, jobject _this, jobject canvas, jobject graphics)
+
+
 /*
  * Utility functions
  */