better args handling

diff --git a/bindings/java/org/videolan/jvlc/JVLC.java b/bindings/java/org/videolan/jvlc/JVLC.java
index 71ed3ffb0e580ce4f696c6eb74f04be9a32bc563..18c848ea34b4d3c0faadac69711c84a55eb35bfd 100644 (file)
--- a/bindings/java/org/videolan/jvlc/JVLC.java
+++ b/bindings/java/org/videolan/jvlc/JVLC.java
@@ -72,7 +72,10 @@ public class JVLC implements Runnable {
     }
     
     public JVLC(String[] args) {
-        _instance      = createInstance( args );
+       String[] myargs = new String[args.length + 1];
+       myargs[0] = "jvlc";
+       System.arraycopy( args, 0, myargs, 1, args.length );
+        _instance      = createInstance( myargs );
         playlist       = new Playlist  ( _instance );
         video          = new Video             ( _instance );
         audio          = new Audio             ( _instance );

diff --git a/bindings/java/src/core-jni.cc b/bindings/java/src/core-jni.cc
index 0e6db07cf05314ca61fedc0de8281a02c2e7d031..a622eec8ac2b6f24c727dc7667d46dec48916da6 100644 (file)
--- a/bindings/java/src/core-jni.cc
+++ b/bindings/java/src/core-jni.cc
@@ -56,11 +56,8 @@ JNIEXPORT jlong JNICALL Java_org_videolan_jvlc_JVLC_createInstance (JNIEnv *env,
     argc = (int) env->GetArrayLength((jarray) args) + 1;
     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
         );
     }
@@ -68,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;
 
 }