From 7928ed90104f71fb53ae8201b3140b8e347b83ee Mon Sep 17 00:00:00 2001 From: Sven Göthel Date: Fri, 2 Feb 2024 14:25:12 +0100 Subject: Bug 1493: Supply language code to SubtitleEvent, perhaps allowsing player to select font for ASS/Text rendering; Remove GLMediaPlayer's getStreamLang() as replaced by getLang() --- src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/jogl/classes/jogamp') diff --git a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java index aa89713d3..8d45edb87 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java +++ b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java @@ -1783,12 +1783,12 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { } protected final void pushSubtitleText(final String text, final int start_display_pts, final int end_display_pts) { if( null != subEventListener ) { - subEventListener.run( new SubTextEvent(this.scodecID, SubTextEvent.TextFormat.TEXT, text, start_display_pts, end_display_pts) ); + subEventListener.run( new SubTextEvent(this.scodecID, getLang(getSID()), SubTextEvent.TextFormat.TEXT, text, start_display_pts, end_display_pts) ); } } protected final void pushSubtitleASS(final String ass, final int start_display_pts, final int end_display_pts) { if( null != subEventListener ) { - subEventListener.run( new SubTextEvent(this.scodecID, SubTextEvent.TextFormat.ASS, ass, start_display_pts, end_display_pts) ); + subEventListener.run( new SubTextEvent(this.scodecID, getLang(getSID()), SubTextEvent.TextFormat.ASS, ass, start_display_pts, end_display_pts) ); } } /** {@link GLMediaPlayerImpl#pushSubtitleTex(Object, int, int, int, int, int, int, int, int, int)} */ @@ -1818,7 +1818,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { subTex.set(texWidth, texHeight, width, height); } if( null != subEventListener ) { - subEventListener.run( new SubBitmapEvent(this.scodecID, new Vec2i(x, y), new Vec2i(width, height), + subEventListener.run( new SubBitmapEvent(this.scodecID, getLang(getSID()), new Vec2i(x, y), new Vec2i(width, height), subTex, start_display_pts, end_display_pts, subTexRelease) ); } else { subTexRelease.release(subTex); // release right away @@ -2200,9 +2200,6 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { return null; } - @Override - public String getStreamLang(final int id) { return "n/a"; } - @Override public final String toString() { final String tt = PTS.toTimeStr(getDuration()); -- cgit v1.2.3