From 469314fff8dc53658db932bab6108107780619ee Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 25 Aug 2013 09:06:58 +0200
Subject: NullGLMediaPlayer: Fix reported VID (fake 0), no AID, textureCount ==
 2

---
 .../classes/jogamp/opengl/util/av/NullGLMediaPlayer.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/jogl/classes/jogamp/opengl/util')

diff --git a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
index 9066f3dd1..6fa7c7a54 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java
@@ -133,11 +133,10 @@ public class NullGLMediaPlayer extends GLMediaPlayerImpl {
     @Override
     protected final void initStreamImpl(int vid, int aid) throws IOException {
         texData = createTestTextureData();
-        final int r_aid = GLMediaPlayer.STREAM_ID_NONE == aid ? GLMediaPlayer.STREAM_ID_NONE : GLMediaPlayer.STREAM_ID_AUTO; 
         final float _fps = 24f;
         final int _duration = 10*60*1000; // msec
         final int _totalFrames = (int) ( (_duration/1000)*_fps );
-        updateAttributes(GLMediaPlayer.STREAM_ID_AUTO, r_aid, 
+        updateAttributes(0 /* fake */, GLMediaPlayer.STREAM_ID_NONE, 
                          texData.getWidth(), texData.getHeight(), 0, 
                          0, 0, _fps, 
                          _totalFrames, 0, _duration, "png-static", null);
@@ -147,6 +146,17 @@ public class NullGLMediaPlayer extends GLMediaPlayerImpl {
         // NOP
     }
     
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns 2
+     * </p>
+     */
+    @Override
+    protected int validateTextureCount(int desiredTextureCount) {
+        return 2;
+    }
+    
     @Override
     protected final TextureSequence.TextureFrame createTexImage(GL gl, int texName) {
         final Texture texture = super.createTexImageImpl(gl, texName, width, height, false);
-- 
cgit v1.2.3