AudioSink: interface add isAudioSinkAvailable

Signed-off-by: Xerxes Rånby <xerxes@zafena.se>
sgothel · Jun 24, 2013 · 6509c31 · 6509c31
1 parent 11e27bf
commit 6509c31
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java b/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java
@@ -161,7 +161,8 @@ public int getDataAvailable() {
         return (NUM_BUFFERS-val[0])*4096;
     }
 
-    public static boolean isAvailable() {
+    @Override
+    public boolean isAudioSinkAvailable() {
         return available;
     }
 }
diff --git a/src/jogl/classes/jogamp/opengl/util/av/AudioSink.java b/src/jogl/classes/jogamp/opengl/util/av/AudioSink.java
@@ -2,6 +2,8 @@
 
 public interface AudioSink {
 
+    boolean isAudioSinkAvailable();
+
     int getDataAvailable();
 
     boolean isDataAvailable(int data_size);

diff --git a/src/jogl/classes/jogamp/opengl/util/av/JavaSoundAudioSink.java b/src/jogl/classes/jogamp/opengl/util/av/JavaSoundAudioSink.java
@@ -71,7 +71,8 @@ public boolean isDataAvailable(int data_size) {
         return auline.available()>=data_size;
     }
 
-    public static boolean isAvailable() {
+    @Override
+    public boolean isAudioSinkAvailable() {
         return available;
     }
 

diff --git a/src/jogl/classes/jogamp/opengl/util/av/NullAudioSink.java b/src/jogl/classes/jogamp/opengl/util/av/NullAudioSink.java
@@ -15,4 +15,9 @@ public boolean isDataAvailable(int data_size) {
     @Override
     public void writeData(byte[] sampleData, int data_size) {
     }
+
+    @Override
+    public boolean isAudioSinkAvailable() {
+        return true;
+    }
 }
diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
@@ -130,11 +130,12 @@ public class FFMPEGMediaPlayer extends EGLMediaPlayerImpl {
             System.err.println("LIB_AV Codec : "+avCodecVersion);
             initIDs0();            
             available = true;
-            audioSink = new NullAudioSink();
-            if(ALAudioSink.isAvailable()) {
-                audioSink = new ALAudioSink();
-            } else if(JavaSoundAudioSink.isAvailable()) {
+            audioSink = new ALAudioSink();
+            if(!audioSink.isAudioSinkAvailable()) {
                 audioSink = new JavaSoundAudioSink();
+                if(!audioSink.isAudioSinkAvailable()) {
+                    audioSink = new NullAudioSink();
+                }
             }
             maxAvailableAudio = audioSink.getDataAvailable();