diff options
author | Sven Göthel <[email protected]> | 2024-01-31 11:28:10 +0100 |
---|---|---|
committer | Sven Göthel <[email protected]> | 2024-01-31 11:28:10 +0100 |
commit | b8b692e9cf3120d788ae912514f54948ddccacf5 (patch) | |
tree | aafde7897934d548789297efc20336754af06624 /src/graphui/classes | |
parent | 72065d9e2a9d6480c34afc9920071d5ed577d37a (diff) |
GLMediaPlayer: Split GLMediaFrameListener (rarely used) from GLMediaEventListener, easing listener callbacks; Prepare SubtitleEventListener generalization (Bug 1494)
Moves pushSound(), pushSubtitle*() from FFMPEGMediaPlayer to GLMediaPlayerImpl,
as it is handled in a generic way - even though currently only called by native FFMPEGMediaPlayer implementation.
Note: This patch is incomplete, i.e. not even compile clean.
But choses as-is to semantically split the work to ease review.
Diffstat (limited to 'src/graphui/classes')
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java | 5 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/widgets/MediaPlayer.java | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java index f26460240..2f8486068 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java @@ -174,11 +174,6 @@ public class MediaButton extends TexSeqButton { private final GLMediaEventListener defGLMediaEventListener = new GLMediaEventListener() { @Override - public void newFrameAvailable(final GLMediaPlayer ts, final TextureFrame newFrame, final long when) { - // texButton.markStateDirty(); - } - - @Override public void attributesChanged(final GLMediaPlayer mp, final GLMediaPlayer.EventMask eventMask, final long when) { if( verbose ) { System.err.println("MediaButton AttributesChanges: "+eventMask+", when "+when); diff --git a/src/graphui/classes/com/jogamp/graph/ui/widgets/MediaPlayer.java b/src/graphui/classes/com/jogamp/graph/ui/widgets/MediaPlayer.java index 07ed203f8..1c62bde9c 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/widgets/MediaPlayer.java +++ b/src/graphui/classes/com/jogamp/graph/ui/widgets/MediaPlayer.java @@ -70,7 +70,6 @@ import com.jogamp.opengl.util.av.GLMediaPlayer.EventMask; import com.jogamp.opengl.util.av.GLMediaPlayer.GLMediaEventListener; import com.jogamp.opengl.util.av.GLMediaPlayer.StreamException; import com.jogamp.opengl.util.texture.TextureSequence; -import com.jogamp.opengl.util.texture.TextureSequence.TextureFrame; /** * Media player {@link Widget}, embedding a {@link MediaButton} and its controls. @@ -164,9 +163,6 @@ public class MediaPlayer extends Widget { mPlayer.setAudioVolume( 0f ); mPlayer.addEventListener( new GLMediaEventListener() { @Override - public void newFrameAvailable(final GLMediaPlayer ts, final TextureFrame newFrame, final long when) { } - - @Override public void attributesChanged(final GLMediaPlayer mp, final EventMask eventMask, final long when) { if( DEBUG ) { System.err.println("MediaButton AttributesChanges: "+eventMask+", when "+when); |