MediaInstance renamed to MediaPlayer

[vlc] / bindings / java / core / src / main / java / org / videolan / jvlc / JVLC.java

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java b/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java
index 7ffaa18e0eb6be403a23982cd617c5338d5ab5eb..6c826234a1961616a5627e0a0c93cb05bfbbcafa 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/JVLC.java
@@ -29,41 +29,59 @@
 
 package org.videolan.jvlc;
 
+import java.awt.Canvas;
+
 import org.videolan.jvlc.internal.LibVlc;
 import org.videolan.jvlc.internal.LibVlc.LibVlcInstance;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
 
 import com.sun.jna.Native;
 
-import java.awt.Canvas;
-
 public class JVLC
 {
 
     private final LibVlcInstance instance;
 
     private final LibVlc libvlc = LibVlc.SYNC_INSTANCE;
+
+    private MediaList mediaList;
+    
+    private VLM vlm;
+    
+    private volatile boolean released;
     
     public JVLC()
     {
-        String[] args = new String[1];
-        args[0] = "jvlc";
+        String[] args = new String[] {};
         instance = createInstance(args);
+        mediaList = new MediaList(this);
     }
 
     public JVLC(String[] args)
     {
-        String[] myargs = new String[args.length + 1];
-        myargs[0] = "jvlc";
-        System.arraycopy(args, 0, myargs, 1, args.length);
-        instance = createInstance(myargs);
+        instance = createInstance(args);
+    }
+    
+    public JVLC(String args)
+    {
+        this(args.split(" "));
     }
 
-    public MediaInstance play(String media)
+    /*
+     * Core methods
+     */
+    private LibVlcInstance createInstance(String[] args)
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        return libvlc.libvlc_new(args.length, args, exception);
+    }
+
+    public MediaPlayer play(String media)
     {
         MediaDescriptor mediaDescriptor = new MediaDescriptor(this, media);
-        MediaInstance mediaInstance = new MediaInstance(mediaDescriptor);
+        MediaPlayer mediaInstance = new MediaPlayer(mediaDescriptor);
         mediaInstance.play();
+        mediaDescriptor.release();
         return mediaInstance;
     }
 
@@ -74,17 +92,44 @@ public class JVLC
         libvlc.libvlc_video_set_parent(instance, drawable, exception );
     }
 
-    /*
-     * Core methods
+    public Logger getLogger()
+    {
+        return new Logger(this);
+    }
+    
+    /**
+     * Returns the mediaList.
+     * @return the mediaList
      */
-    private LibVlcInstance createInstance(String[] args)
+    public MediaList getMediaList()
+    {
+        return mediaList;
+    }
+
+    public VLM getVLM()
+    {
+        if (vlm != null)
+        {
+            vlm.release();
+        }
+        this.vlm = new VLM(this);
+        return vlm;
+    }
+    
+    public LoggerVerbosityLevel getLogVerbosity()
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        libvlc.libvlc_exception_init(exception);
+        int level = libvlc.libvlc_get_log_verbosity(instance, exception);
+        return LoggerVerbosityLevel.getSeverity(level);
+    }
 
-        return libvlc.libvlc_new(args.length, args, exception);
+    public void setLogVerbosity(LoggerVerbosityLevel level)
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        libvlc.libvlc_set_log_verbosity(instance, level.ordinal(), exception);
     }
 
+    
     /**
      * Returns the _instance.
      * @return the _instance
@@ -102,6 +147,24 @@ public class JVLC
     {
         return libvlc;
     }
+    
+    /**
+     * Releases this instance and the native resources.
+     */
+    public void release()
+    {
+        if (released)
+        {
+            return;
+        }
+        released = true;
+        if (vlm != null)
+        {
+            vlm.release();
+            vlm = null;
+        }
+        libvlc.libvlc_release(instance);
+    }
 
     /*
      * (non-Javadoc)
@@ -110,7 +173,8 @@ public class JVLC
     @Override
     protected void finalize() throws Throwable
     {
-        libvlc.libvlc_release(instance);
+        release();
         super.finalize();
     }
+    
 }