From 9a7b9768e2e018a33ca44a170f372fee84c26a27 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 9 May 2023 06:48:29 +0200
Subject: GLMediaPlayer: Replace GLMediaEventListener.EVENT_CHANGE_* 'int
event_mask' with EventMask.Bit/EventMask
---
.../opengl/demos/android/MovieCubeActivity0a.java | 10 ++++----
.../opengl/demos/android/MovieCubeActivity0b.java | 10 ++++----
.../opengl/demos/android/MovieSimpleActivity0.java | 12 ++++-----
.../jogamp/opengl/demos/av/CrossFadePlayer.java | 25 +++++++++----------
.../com/jogamp/opengl/demos/av/MovieCube.java | 20 +++++++--------
.../com/jogamp/opengl/demos/av/MovieSBSStereo.java | 23 +++++++----------
.../com/jogamp/opengl/demos/av/MovieSimple.java | 29 +++++++++-------------
7 files changed, 59 insertions(+), 70 deletions(-)
(limited to 'src/demos/com/jogamp')
diff --git a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java
index dfd0c94dc..cdaf39f2b 100644
--- a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java
+++ b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0a.java
@@ -105,18 +105,18 @@ public class MovieCubeActivity0a extends NewtBaseActivity {
}
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieCubeActivity0 AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) {
+ System.err.println("MovieCubeActivity0 AttributesChanges: "+eventMask+", when "+when);
System.err.println("MovieCubeActivity0 State: "+mp);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_INIT & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Init) ) {
glWindowMain.addGLEventListener(demoMain);
anim.setUpdateFPSFrames(60*5, null);
anim.resetFPSCounter();
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_PLAY & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Play) ) {
anim.resetFPSCounter();
}
- if( 0 != ( ( GLMediaEventListener.EVENT_CHANGE_ERR | GLMediaEventListener.EVENT_CHANGE_EOS ) & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Error) || eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
final StreamException se = mPlayer.getStreamException();
if( null != se ) {
se.printStackTrace();
diff --git a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java
index 649739e09..1b4696180 100644
--- a/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java
+++ b/src/demos/com/jogamp/opengl/demos/android/MovieCubeActivity0b.java
@@ -107,18 +107,18 @@ public class MovieCubeActivity0b extends NewtBaseActivity {
}
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieCubeActivity0 AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) {
+ System.err.println("MovieCubeActivity0 AttributesChanges: "+eventMask+", when "+when);
System.err.println("MovieCubeActivity0 State: "+mp);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_INIT & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Init) ) {
glWindowMain.addGLEventListener(demoMain);
anim.setUpdateFPSFrames(60*5, null);
anim.resetFPSCounter();
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_PLAY & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Play) ) {
anim.resetFPSCounter();
}
- if( 0 != ( ( GLMediaEventListener.EVENT_CHANGE_ERR | GLMediaEventListener.EVENT_CHANGE_EOS ) & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Error) || eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
final StreamException se = mPlayer.getStreamException();
if( null != se ) {
se.printStackTrace();
diff --git a/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java b/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java
index ecc417bb8..c80afab89 100644
--- a/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java
+++ b/src/demos/com/jogamp/opengl/demos/android/MovieSimpleActivity0.java
@@ -47,7 +47,6 @@ import com.jogamp.newt.event.MouseEvent;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.av.GLMediaPlayer;
-import com.jogamp.opengl.util.av.GLMediaPlayer.GLMediaEventListener;
import com.jogamp.opengl.util.av.GLMediaPlayer.StreamException;
import com.jogamp.opengl.util.texture.TextureSequence.TextureFrame;
@@ -58,7 +57,8 @@ public class MovieSimpleActivity0 extends NewtBaseActivity {
static String TAG = "MovieSimpleActivity0";
MouseAdapter toFrontMouseListener = new MouseAdapter() {
- public void mouseClicked(final MouseEvent e) {
+ @Override
+ public void mouseClicked(final MouseEvent e) {
final Object src = e.getSource();
if(src instanceof Window) {
((Window)src).requestFocus(false);
@@ -104,15 +104,15 @@ public class MovieSimpleActivity0 extends NewtBaseActivity {
public void newFrameAvailable(final GLMediaPlayer ts, final TextureFrame newFrame, final long when) { }
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieSimpleActivity0 AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) {
+ System.err.println("MovieSimpleActivity0 AttributesChanges: "+eventMask+", when "+when);
System.err.println("MovieSimpleActivity0 State: "+mp);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_INIT & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Init) ) {
glWindowMain.addGLEventListener(demoMain);
anim.setUpdateFPSFrames(60*5, System.err);
anim.resetFPSCounter();
}
- if( 0 != ( ( GLMediaEventListener.EVENT_CHANGE_ERR | GLMediaEventListener.EVENT_CHANGE_EOS ) & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Error) || eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
final StreamException se = mPlayer.getStreamException();
if( null != se ) {
se.printStackTrace();
diff --git a/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java b/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java
index 0e028279c..0270ee709 100644
--- a/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java
+++ b/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java
@@ -64,17 +64,17 @@ public class CrossFadePlayer
public void newFrameAvailable(final GLMediaPlayer ts, final TextureFrame newFrame, final long when) { }
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when)
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when)
{
- System.out.println("\n***\nEvent mask changed: " + event_mask);
- System.out.println("Timestamp: "+ when);
+ System.out.println("\n***\nAttributesChanges: "+eventMask+", when "+when);
System.out.println("State of player: " + mp.getState().toString() +"\n");
- if ((event_mask & GLMediaEventListener.EVENT_CHANGE_INIT) !=0) {
+ if ( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Init) ) {
System.out.println("Duration: " + mp.getDuration() + "ms");
System.out.println("Volume: " + mp.getAudioVolume());
System.out.println("player.initGL()...");
new InterruptSource.Thread() {
+ @Override
public void run() {
try {
mp.initGL(null);
@@ -86,20 +86,18 @@ public class CrossFadePlayer
}
}
}.start();
- } else if ((event_mask & GLMediaEventListener.EVENT_CHANGE_PAUSE) !=0) {
- System.out.println("player.paused()...");
- } else if ((event_mask & GLMediaEventListener.EVENT_CHANGE_PLAY) !=0) {
- System.out.println("playing...");
+ } else if ( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Pause) ) {
+ } else if ( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Play) ) {
System.out.println(mp.toString());
System.out.println(mp.getAudioSink().toString());
- } else if( 0 != ( GLMediaEventListener.EVENT_CHANGE_EOS & event_mask ) ) {
+ } else if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
final StreamException se = mp.getStreamException();
if( null != se ) {
- System.err.println("Player State: EOS + Exception");
+ System.err.println("Player State: Exception");
stop = true;
} else {
- System.err.println("Player State: EOS");
new InterruptSource.Thread() {
+ @Override
public void run() {
System.out.println("mp.setPlaySpeed(1f) returned: " + mp.setPlaySpeed(1f));
mp.seek(0);
@@ -108,13 +106,14 @@ public class CrossFadePlayer
}.start();
}
}
- if( 0 != ( ( GLMediaEventListener.EVENT_CHANGE_ERR | GLMediaEventListener.EVENT_CHANGE_EOS ) & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Error) || eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
final StreamException se = mp.getStreamException();
if( null != se ) {
se.printStackTrace();
}
new InterruptSource.Thread() {
- public void run() {
+ @Override
+ public void run() {
System.out.println("terminating...");
stop = true;
}
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java
index 0be2c35ba..6fafc6dc7 100644
--- a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java
+++ b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java
@@ -112,13 +112,13 @@ public class MovieCube implements GLEventListener {
public void newFrameAvailable(final GLMediaPlayer ts, final TextureFrame newFrame, final long when) { }
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieCube AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) {
+ System.err.println("MovieCube AttributesChanges: "+eventMask+", when "+when);
System.err.println("MovieCube State: "+mp);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_SIZE & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Size) ) {
resetGLState();
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_EOS & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
new InterruptSource.Thread() {
@Override
public void run() {
@@ -602,24 +602,24 @@ public class MovieCube implements GLEventListener {
}
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieCube AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask event_mask, final long when) {
+ System.err.println("MovieCube AttributesChanges: events_mask "+event_mask+", when "+when);
System.err.println("MovieCube State: "+mp);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_SIZE & event_mask ) ) {
+ if( event_mask.isSet(GLMediaPlayer.EventMask.Bit.Size) ) {
if( origSize ) {
window.setSurfaceSize(mp.getWidth(), mp.getHeight());
}
// window.disposeGLEventListener(ms, false /* remove */ );
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_INIT & event_mask ) ) {
+ if( event_mask.isSet(GLMediaPlayer.EventMask.Bit.Init) ) {
anim.setUpdateFPSFrames(60, null);
anim.resetFPSCounter();
mc.resetGLState();
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_PLAY & event_mask ) ) {
+ if( event_mask.isSet(GLMediaPlayer.EventMask.Bit.Play) ) {
anim.resetFPSCounter();
}
- if( 0 != ( ( GLMediaEventListener.EVENT_CHANGE_ERR | GLMediaEventListener.EVENT_CHANGE_EOS ) & event_mask ) ) {
+ if( event_mask.isSet(GLMediaPlayer.EventMask.Bit.Error) || event_mask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
final StreamException se = mc.mPlayer.getStreamException();
if( null != se ) {
se.printStackTrace();
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java b/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java
index 3c3350061..49a6b6fbb 100644
--- a/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java
+++ b/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java
@@ -829,20 +829,18 @@ public class MovieSBSStereo implements StereoGLEventListener {
}
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieSimple AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) {
+ System.err.println("MovieSimple AttributesChanges: "+eventMask+", when "+when);
System.err.println("MovieSimple State: "+mp);
final GLWindow window = (GLWindow) mp.getAttachedObject(WINDOW_KEY);
final MovieSBSStereo ms = (MovieSBSStereo)mp.getAttachedObject(PLAYER);
final StereoClientRenderer stereoClientRenderer = (StereoClientRenderer) mp.getAttachedObject(STEREO_RENDERER_KEY);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_SIZE & event_mask ) ) {
- System.err.println("MovieSimple State: CHANGE_SIZE");
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Size) ) {
// window.disposeGLEventListener(ms, false /* remove */ );
ms.resetGLState();
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_INIT & event_mask ) ) {
- System.err.println("MovieSimple State: INIT");
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Init) ) {
// Use GLEventListener in all cases [A+V, V, A]
stereoClientRenderer.addGLEventListener(ms);
final GLAnimatorControl anim = window.getAnimator();
@@ -850,20 +848,19 @@ public class MovieSBSStereo implements StereoGLEventListener {
anim.resetFPSCounter();
ms.setStereoClientRenderer(stereoClientRenderer);
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_PLAY & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Play) ) {
window.getAnimator().resetFPSCounter();
}
boolean destroy = false;
Throwable err = null;
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_EOS & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
err = ms.mPlayer.getStreamException();
if( null != err ) {
- System.err.println("MovieSimple State: EOS + Exception");
+ System.err.println("MovieSimple State: Exception");
destroy = true;
} else {
- System.err.println("MovieSimple State: EOS");
new InterruptSource.Thread() {
@Override
public void run() {
@@ -874,12 +871,10 @@ public class MovieSBSStereo implements StereoGLEventListener {
}.start();
}
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_ERR & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Error) ) {
err = ms.mPlayer.getStreamException();
if( null != err ) {
- System.err.println("MovieSimple State: ERR + Exception");
- } else {
- System.err.println("MovieSimple State: ERR");
+ System.err.println("MovieSimple State: Exception");
}
destroy = true;
}
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java
index deed019d1..f851cc4e7 100644
--- a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java
+++ b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java
@@ -378,10 +378,10 @@ public class MovieSimple implements GLEventListener {
public void newFrameAvailable(final GLMediaPlayer ts, final TextureFrame newFrame, final long when) { }
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieSimple AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) {
+ System.err.println("MovieSimple AttributesChanges: "+eventMask+", when "+when);
System.err.println("MovieSimple State: "+mp);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_EOS & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
new InterruptSource.Thread() {
@Override
public void run() {
@@ -577,21 +577,19 @@ public class MovieSimple implements GLEventListener {
}
@Override
- public void attributesChanged(final GLMediaPlayer mp, final int event_mask, final long when) {
- System.err.println("MovieSimple AttributesChanges: events_mask 0x"+Integer.toHexString(event_mask)+", when "+when);
+ public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) {
+ System.err.println("MovieSimple AttributesChanges: "+eventMask+", when "+when);
System.err.println("MovieSimple State: "+mp);
final GLWindow window = (GLWindow) mp.getAttachedObject(WINDOW_KEY);
final MovieSimple ms = (MovieSimple)mp.getAttachedObject(PLAYER);
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_SIZE & event_mask ) ) {
- System.err.println("MovieSimple State: CHANGE_SIZE");
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Size) ) {
if( origSize ) {
window.setSurfaceSize(mp.getWidth(), mp.getHeight());
}
// window.disposeGLEventListener(ms, false /* remove */ );
// ms.resetGLState();
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_INIT & event_mask ) ) {
- System.err.println("MovieSimple State: INIT");
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Init) ) {
// Use GLEventListener in all cases [A+V, V, A]
final GLAnimatorControl anim = window.getAnimator();
anim.setUpdateFPSFrames(60, null);
@@ -618,20 +616,19 @@ public class MovieSimple implements GLEventListener {
}.start();
*/
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_PLAY & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Play) ) {
window.getAnimator().resetFPSCounter();
}
boolean destroy = false;
Throwable err = null;
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_EOS & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.EOS) ) {
err = ms.mPlayer.getStreamException();
if( null != err ) {
- System.err.println("MovieSimple State: EOS + Exception");
+ System.err.println("MovieSimple State: Exception");
destroy = true;
} else {
- System.err.println("MovieSimple State: EOS");
if( loopEOS ) {
new InterruptSource.Thread() {
@Override
@@ -646,12 +643,10 @@ public class MovieSimple implements GLEventListener {
}
}
}
- if( 0 != ( GLMediaEventListener.EVENT_CHANGE_ERR & event_mask ) ) {
+ if( eventMask.isSet(GLMediaPlayer.EventMask.Bit.Error) ) {
err = ms.mPlayer.getStreamException();
if( null != err ) {
- System.err.println("MovieSimple State: ERR + Exception");
- } else {
- System.err.println("MovieSimple State: ERR");
+ System.err.println("MovieSimple State: Exception");
}
destroy = true;
}
--
cgit v1.2.3