java audio interface update

diff --git a/bindings/java/VLCExample.java b/bindings/java/VLCExample.java
index b02946b56bfed6dfe564e424444e96714a4315fe..92264d117c312ee391ef1b39ddf9518b0a16ff08 100644 (file)
--- a/bindings/java/VLCExample.java
+++ b/bindings/java/VLCExample.java
@@ -3,60 +3,86 @@ import org.videolan.jvlc.JVLC;
 import org.videolan.jvlc.VLCException;
 
 
-public class VLCExample 
+public class VLCExample
 {
 
-    public static void main( String[] args )
+    public static void main(String[] args) throws InterruptedException
     {
-       boolean videoInput = false;
+        System.out.println("== Starting VLCExample ==");
+        boolean videoInput = false;
+        if (args.length == 0)
+        {
+            System.out.print("Creating a JVLC instance without args");
+        }
+        else
+        {
+            System.out.println("Creating a JVLC instance with args: ");
+            for (int i = 0; i < args.length; i++)
+            {
+                System.out.println(i + ") " + args[i]);
+            }
+        }
         JVLC jvlc = new JVLC(args);
-        try {
-        //jvlc.playlist.add("file://" + System.getProperty( "user.dir" ) + "/a.avi", "a.avi");
-               jvlc.playlist.add("file:///home/little/a.avi", "a.avi");
-       jvlc.playlist.add("file://" + System.getProperty( "user.dir" ) + "/a.mp3", "a.mp3");
-        jvlc.playlist.play( -1 , null );
-        } catch (VLCException e) {
-               e.printStackTrace();
+        System.out.println("... done.");
+
+        try
+        {
+            // jvlc.playlist.add("file://" + System.getProperty( "user.dir" ) + "/a.avi", "a.avi");
+            jvlc.playlist.add("file:///home/little/a.avi", "a.avi");
+            // jvlc.playlist.add("file://" + System.getProperty( "user.dir" ) + "/a.mp3", "a.mp3");
+            jvlc.playlist.play(-1, null);
+        }
+        catch (VLCException e)
+        {
+            e.printStackTrace();
         }
-        while (! jvlc.isInputPlaying()) ;
-       while (! jvlc.hasVout() );        
-        
-       
-       
-       // testing vout functionalities
 
-        try {
-               Thread.sleep(2500);
-               if (jvlc.hasVout()) videoInput = true;
-               } catch (InterruptedException e) {
-                               e.printStackTrace();
-               }
+        while (! jvlc.isInputPlaying())
+        {
+            Thread.sleep(100);
+        }
+        while (! jvlc.hasVout() )
+        {
+            Thread.sleep(100);
+        }
 
-        if (videoInput) {
-               try {
-                       System.out.print(jvlc.video.getWidth());
-                       System.out.print("x");
-                       System.out.println(jvlc.video.getHeight());
-               } catch (VLCException e) {
-                       e.printStackTrace();
-               }
+        // testing vout functionalities
+        Thread.sleep(2500);
+        if (jvlc.hasVout())
+        {
+            videoInput = true;
+        }
+        
+        if (videoInput)
+        {
+            try
+            {
+                System.out.print(jvlc.video.getWidth());
+                System.out.print("x");
+                System.out.println(jvlc.video.getHeight());
+            }
+            catch (VLCException e)
+            {
+                e.printStackTrace();
+            }
         }
-        try 
+        try
         {
-               if (videoInput) {
-                       System.out.print("Fullscreen... ");             
-                       jvlc.video.setFullscreen(true);
-                       Thread.sleep(3000);
-                       System.out.println("real size.");
+            if (videoInput)
+            {
+                System.out.print("Fullscreen... ");
+                jvlc.video.setFullscreen(true);
+                Thread.sleep(3000);
+                System.out.println("real size.");
                 jvlc.video.setFullscreen(false);
-               System.out.print("Taking snapshot... ");
-               jvlc.video.getSnapshot( System.getProperty( "user.dir" ) + "/snap.png");
-               System.out.println("taken. (see " + System.getProperty( "user.dir" ) + "/snap.png )");
-                       Thread.sleep(2000);
+                System.out.print("Taking snapshot... ");
+                jvlc.video.getSnapshot(System.getProperty("user.dir") + "/snap.png");
+                System.out.println("taken. (see " + System.getProperty("user.dir") + "/snap.png )");
+                Thread.sleep(2000);
                 System.out.println("Resizing to 300x300");
                 jvlc.video.setSize(300, 300);
-                                
-               }
+
+            }
             System.out.print("Muting...");
             jvlc.audio.setMute(true);
             Thread.sleep(3000);
@@ -67,50 +93,54 @@ public class VLCExample
             System.out.print("Setting volume to 150... ");
             jvlc.audio.setVolume(150);
             System.out.println("done");
-//            System.out.println("Audio channel info: " + jvlc.audio.getChannel());
-//            System.out.println("Audio track info: " + jvlc.audio.getTrack());
-//            System.out.print("Setting left channel... ");
-//            jvlc.audio.setChannel("left");
-//            System.out.print("done.");
-//            Thread.sleep(3000);
-//            System.out.print("Setting right channel... ");
-//            jvlc.audio.setChannel(AudioIntf.RIGHT_CHANNEL);
-//            System.out.print("done.");
-//            Thread.sleep(3000);
+            System.out.println("== AUDIO INFO ==");
+            int currentChannel = jvlc.audio.getChannel();
+            System.out.println("Audio track number: " + jvlc.audio.getTrack());
+            System.out.println("Audio channel info: " + jvlc.audio.getChannel());
+            System.out.print("Setting left channel... ");
+            jvlc.audio.setChannel(AudioIntf.LEFT_CHANNEL);
+            System.out.println("done.");
+            Thread.sleep(3000);
+            System.out.print("Setting right channel... ");
+            jvlc.audio.setChannel(AudioIntf.RIGHT_CHANNEL);
+            System.out.println("done.");
+            Thread.sleep(3000);
+            System.out.print("Reverting to original channel");
+            jvlc.audio.setChannel(currentChannel);
+            System.out.println("done.");
+            Thread.sleep(3000);
             System.out.println("INPUT INFORMATION");
             System.out.println("-----------------");
             System.out.println("Total length   (ms) :\t" + jvlc.input.getLength());
             System.out.println("Input time     (ms) :\t" + jvlc.input.getTime());
             System.out.println("Input position [0-1]:\t" + jvlc.input.getPosition());
             if (videoInput)
-               System.out.println("Input FPS          :\t" + jvlc.input.getFPS());
-           
-            
+                System.out.println("Input FPS          :\t" + jvlc.input.getFPS());
+
         }
-        
-        catch (Exception e) 
+
+        catch (Exception e)
         {
-               System.out.println("Something was wrong. I die :(.");
+            System.out.println("Something was wrong. I die :(.");
             jvlc.destroy();
             e.printStackTrace();
             System.exit(0);
         }
-        
-       System.out.println("Everything fine ;)");
-       System.out.println("Playing next item");
-       try {
-               jvlc.playlist.next();
-       } catch (VLCException e) {
-               e.printStackTrace();
-       }
-       
-       try {
-               Thread.sleep(3000);
-       } catch (InterruptedException e) {
-               e.printStackTrace();
-       }
-       jvlc.destroy();
+
+        System.out.println("Everything fine ;)");
+        System.out.println("Playing next item");
+        try
+        {
+            jvlc.playlist.next();
+        }
+        catch (VLCException e)
+        {
+            e.printStackTrace();
+        }
+
+        Thread.sleep(3000);
+
+        jvlc.destroy();
         return;
     }
 }
-

diff --git a/bindings/java/org/videolan/jvlc/AudioIntf.java b/bindings/java/org/videolan/jvlc/AudioIntf.java
index 090aeffa50c010604485bb785338888a1beb1555..1d119233bb05141162c61011c731fef973776626 100644 (file)
--- a/bindings/java/org/videolan/jvlc/AudioIntf.java
+++ b/bindings/java/org/videolan/jvlc/AudioIntf.java
@@ -35,25 +35,25 @@ public interface AudioIntf {
        /**
         * Constant for left channel audio 
         */
-       final String LEFT_CHANNEL               = "left";
+       final int LEFT_CHANNEL          = 3;
        
        /**
         * Constant for right channel audio 
         */
-       final String RIGHT_CHANNEL              = "right";
+       final int RIGHT_CHANNEL         = 4;
 
        /**
         * Constant for reverse channel audio 
         */
-       final String REVERSE_CHANNEL    = "reverse";
+       final int REVERSE_CHANNEL       = 2;
        /**
         * Constant for stereo channel audio 
         */
-       final String STEREO_CHANNEL     = "stereo";
+       final int STEREO_CHANNEL        = 1;
        /**
         * Constant for dolby channel audio 
         */
-       final String DOLBY_CHANNEL              = "dolby";
+       final int DOLBY_CHANNEL         = 5;
 
        /**
         * @return audio track