From 9bb8fe7c2baff185a62cf4806cfa34dfad4f7a4c Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 6 Apr 2012 03:56:18 +0200
Subject: GLMediaPlayer: Add (c) tag; Add NullGLMediaPlayer (dummy texture);

- Factory falls back to NullGLMediaPlayer allowing to test on platforms where no player is available.
- MovieSimple (c) to JogAmp since it is no more derived from the old project.
---
 .../jogamp/opengl/av/GLMediaPlayerImpl.java        | 31 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java')

diff --git a/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java b/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java
index 93b56e316..df4cc7625 100644
--- a/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java
+++ b/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java
@@ -1,3 +1,30 @@
+/**
+ * Copyright 2012 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
 package jogamp.opengl.av;
 
 import java.io.IOException;
@@ -137,7 +164,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer {
     @Override
     public final State initStream(URLConnection urlConn) throws IllegalStateException, IOException {
         if(State.UninitializedStream != state) {
-            throw new IllegalStateException("Instance not in state "+State.UninitializedStream+", but "+state);
+            throw new IllegalStateException("Instance not in state "+State.UninitializedStream+", but "+state+", "+this);
         }
         this.urlConn = urlConn;
         if (this.urlConn != null) {
@@ -162,7 +189,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer {
     @Override
     public final State initGL(GL gl) throws IllegalStateException, GLException {
         if(State.UninitializedGL != state) {
-            throw new IllegalStateException("Instance not in state "+State.UninitializedGL+", but "+state);
+            throw new IllegalStateException("Instance not in state "+State.UninitializedGL+", but "+state+", "+this);
         }
         final GLContext ctx = gl.getContext();
         if(!ctx.isCurrent()) {
-- 
cgit v1.2.3