fix

Author: squi2rel

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.16.14
 loom_version=1.10-SNAPSHOT
 
 # Mod Properties
-mod_version=1.5.8
+mod_version=1.5.9
 maven_group=com.github.squi2rel.vp
 archives_base_name=VideoPlayer
 

src/client/java/com/github/squi2rel/vp/video/VideoPlayer.java

@@ -85,15 +85,13 @@ public int getHeight() {
     @Override
     public void play(VideoInfo info) {
         if (targetTime > 0) {
-            decoder.onPlay(() -> {
-                long time = targetTime;
-                MinecraftClient.getInstance().execute(() -> {
-                    setVolume(config.volume);
-                    decoder.setProgress(time);
-                });
-                decoder.onPlay(() -> {});
-            });
+            String[] params = info.params();
+            String[] newParams = new String[params.length + 1];
+            System.arraycopy(params, 0, newParams, 0, params.length);
+            newParams[newParams.length - 1] = ":start-time=" + targetTime / 1000f;
+            info = new VideoInfo(info.playerName(), info.name(), info.path(), info.rawPath(), info.expire(), info.seekable(), newParams);
         }
+        decoder.onPlay(() -> decoder.submit(() -> decoder.setVolume(config.volume)));
         decoder.init(info);
     }
 

src/client/java/com/github/squi2rel/vp/video/VlcDecoder.java

@@ -15,8 +15,6 @@
 import java.nio.ByteBuffer;
 import java.util.function.BiConsumer;
 
-import static com.github.squi2rel.vp.video.StreamListener.runAsync;
-
 public class VlcDecoder {
     private static MediaPlayerFactory factory;
     private final EmbeddedMediaPlayer mediaPlayer;
@@ -60,7 +58,7 @@ public void finished(MediaPlayer mediaPlayer) {
 
             @Override
             public void error(MediaPlayer mediaPlayer) {
-                mediaPlayer.controls().stop();
+                mediaPlayer.submit(() -> mediaPlayer.controls().stop());
             }
         });
         mediaPlayer.video().setAdjustVideo(false);
@@ -84,6 +82,10 @@ public void onPlay(Runnable playListener) {
         this.playListener = playListener;
     }
 
+    public void submit(Runnable r) {
+        mediaPlayer.submit(r);
+    }
+
     public void init(VideoInfo info) {
         mediaPlayer.media().play(info.path(), info.params());
     }
@@ -94,13 +96,11 @@ public ByteBuffer decodeNextFrame() {
 
     public void cleanup() {
         stop();
-        Thread t = new Thread(mediaPlayer::release);
-        t.setDaemon(true);
-        t.start();
+        mediaPlayer.submit(mediaPlayer::release);
     }
 
     public void stop() {
-        runAsync(() -> mediaPlayer.controls().stop());
+        mediaPlayer.submit(() -> mediaPlayer.controls().stop());
         glBuffer = null;
         buffer = null;
     }

src/main/java/com/github/squi2rel/vp/video/StreamListener.java

@@ -21,27 +21,23 @@ public class StreamListener implements IVideoListener {
     private static final MediaPlayerEventAdapter callback = new MediaPlayerEventAdapter() {
         @Override
         public void playing(MediaPlayer mediaPlayer) {
-            System.out.println("playing event triggered");
             StreamListener listener = references.get(mediaPlayer);
             if (listener == null) return;
             listener.playing.accept(listener.player.status().isSeekable());
         }
 
         @Override
         public void stopped(MediaPlayer mediaPlayer) {
-            System.out.println("stopped event triggered");
             finish(mediaPlayer);
         }
 
         @Override
         public void finished(MediaPlayer mediaPlayer) {
-            System.out.println("Finished event triggered");
             finish(mediaPlayer);
         }
 
         @Override
         public void error(MediaPlayer mediaPlayer) {
-            System.out.println("errored event triggered");
             StreamListener listener = references.get(mediaPlayer);
             if (listener == null) return;
             synchronized (listener) {
@@ -50,7 +46,7 @@ public void error(MediaPlayer mediaPlayer) {
                 listener.errored.run();
                 listener.stopped.run();
                 listener.player = null;
-                runAsync(() -> {
+                mediaPlayer.submit(() -> {
                     mediaPlayer.controls().stop();
                     mediaPlayer.release();
                 });
@@ -67,7 +63,7 @@ private static void finish(MediaPlayer mediaPlayer) {
             listener.player = null;
             listener.stopped.run();
         }
-        mediaPlayer.release();
+        mediaPlayer.submit(mediaPlayer::release);
     }
 
     public StreamListener(VideoInfo info) {
@@ -85,8 +81,10 @@ public StreamListener(VideoInfo info) {
                     timeout.run();
                     stopped.run();
                 }
-                p.controls().stop();
-                p.release();
+                p.submit(() -> {
+                    p.controls().stop();
+                    p.release();
+                });
             } catch (Exception ignored) {
             }
         });
@@ -141,7 +139,7 @@ public void cancel() {
             references.remove(player);
             player = null;
         }
-        runAsync(() -> {
+        p.submit(() -> {
             p.controls().stop();
             p.release();
         });