jvlc: LibVlc class updated and code aligned to current native libvlc

[vlc] / bindings / java / samples / client / src / main / java / VlcClient.java

diff --git a/bindings/java/samples/client/src/main/java/VlcClient.java b/bindings/java/samples/client/src/main/java/VlcClient.java
index f139fb7b8f0b0e577abd548f2629f0ef4ba5d7de..921c049607acce6608eec09e8ea0fb1420fc03c2 100644 (file)
--- a/bindings/java/samples/client/src/main/java/VlcClient.java
+++ b/bindings/java/samples/client/src/main/java/VlcClient.java
@@ -31,17 +31,21 @@ import java.awt.event.WindowEvent;
 import javax.swing.JPanel;
 
 import org.videolan.jvlc.JVLC;
-import org.videolan.jvlc.Playlist;
-import org.videolan.jvlc.VLCException;
+import org.videolan.jvlc.MediaPlayer;
 
 
 class VLCPlayerFrame extends Frame
 {
 
-    private Playlist playlist;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -7471950211795850421L;
 
     public Canvas jvcanvas;
 
+    private MediaPlayer mediaPlayer;
+
     public VLCPlayerFrame(String[] args)
     {
         initComponents(args);
@@ -62,11 +66,10 @@ class VLCPlayerFrame extends Frame
         jvcanvas = new java.awt.Canvas();
         jvcanvas.setSize(200, 200);
         jvcc.add(jvcanvas);
-        
+
         jvlc = new JVLC(args);
+        jvlc.setVideoOutput(jvcanvas);
         
-        playlist = new Playlist(jvlc);
-
         setLayout(new java.awt.GridBagLayout());
 
         gridBagConstraints = new java.awt.GridBagConstraints();
@@ -150,41 +153,31 @@ class VLCPlayerFrame extends Frame
 
     private void stopButtonActionPerformed(java.awt.event.ActionEvent evt)
     {
-        try
-        {
-            playlist.stop();
-        }
-        catch (Exception e)
+        if (mediaPlayer == null)
         {
-            e.printStackTrace();
+            return;
         }
+        mediaPlayer.stop();
     }
 
     private void pauseButtonActionPerformed(java.awt.event.ActionEvent evt)
     {
-        try
-        {
-            playlist.togglePause();
-        }
-        catch (Exception e)
+        if (mediaPlayer == null)
         {
-            e.printStackTrace();
+            return;
         }
+        mediaPlayer.pause();
     }
 
     private void setButtonActionPerformed(java.awt.event.ActionEvent evt)
     {
-        try
-        {
-            jvlc.setVideoOutput(jvcanvas);
-            playlist.add(jTextField1.getText(), "a.avi");
-            playlist.play();
-        }
-        catch (VLCException e)
+        if (mediaPlayer != null)
         {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            mediaPlayer.stop();
+            mediaPlayer.release();
+            jvcanvas = new java.awt.Canvas();
         }
+        mediaPlayer = jvlc.play(jTextField1.getText());
     }
 
     private void fullScreenButtonActionPerformed(java.awt.event.ActionEvent evt)