Added metadataAvailable and playbackHaltStateChanged events + use state time instead of codec time

Author: devgianlu

api/README.md

@@ -28,6 +28,8 @@ The currently available events are:
 - `playbackPaused`
 - `playbackResumed`
 - `trackSeeked`
+- `metadataAvailable`
+- `playbackHaltStateChanged`
 
 ## Examples
 

api/src/main/java/xyz/gianlu/librespot/api/handlers/EventsHandler.java

@@ -14,7 +14,7 @@
 import xyz.gianlu.librespot.mercury.model.PlayableId;
 import xyz.gianlu.librespot.player.Player;
 
-public class EventsHandler extends WebSocketProtocolHandshakeHandler implements Player.EventsListener {
+public final class EventsHandler extends WebSocketProtocolHandshakeHandler implements Player.EventsListener {
     private static final Logger LOGGER = Logger.getLogger(EventsHandler.class);
 
     public EventsHandler(@NotNull Session session) {
@@ -68,4 +68,22 @@ public void onTrackSeeked(long trackTime) {
         obj.addProperty("trackTime", trackTime);
         dispatch(obj);
     }
+
+    @Override
+    public void onMetadataAvailable(Metadata.@Nullable Track track, Metadata.@Nullable Episode episode) {
+        JsonObject obj = new JsonObject();
+        obj.addProperty("event", "metadataAvailable");
+        if (track != null) obj.add("track", ProtobufToJson.convert(track));
+        if (episode != null) obj.add("episode", ProtobufToJson.convert(episode));
+        dispatch(obj);
+    }
+
+    @Override
+    public void onPlaybackHaltStateChanged(boolean halted, long trackTime) {
+        JsonObject obj = new JsonObject();
+        obj.addProperty("event", "playbackHaltStateChanged");
+        obj.addProperty("trackTime", trackTime);
+        obj.addProperty("halted", halted);
+        dispatch(obj);
+    }
 }

core/src/main/java/xyz/gianlu/librespot/player/Player.java

@@ -241,6 +241,8 @@ private void updateStateWithHandler() {
         if ((track = trackHandler.track()) != null) state.enrichWithMetadata(track);
         else if ((episode = trackHandler.episode()) != null) state.enrichWithMetadata(episode);
         else LOGGER.warn("Couldn't update metadata!");
+
+        events.metadataAvailable();
     }
 
     @Override
@@ -367,6 +369,8 @@ public void playbackHalted(@NotNull TrackHandler handler, int chunk) {
 
             state.setState(true, false, true);
             state.updated();
+
+            events.playbackHaltStateChanged(true);
         }
     }
 
@@ -378,6 +382,8 @@ public void playbackResumedFromHalt(@NotNull TrackHandler handler, int chunk, lo
             state.setPosition(state.getPosition() - diff);
             state.setState(true, false, false);
             state.updated();
+
+            events.playbackHaltStateChanged(false);
         }
     }
 
@@ -703,20 +709,24 @@ public interface EventsListener {
         void onPlaybackResumed(long trackTime);
 
         void onTrackSeeked(long trackTime);
+
+        void onMetadataAvailable(@Nullable Metadata.Track track, @Nullable Metadata.Episode episode);
+
+        void onPlaybackHaltStateChanged(boolean halted, long trackTime);
     }
 
     private class EventsDispatcher {
         private final ExecutorService executorService = Executors.newSingleThreadExecutor(new NameThreadFactory((r) -> "player-events-" + r.hashCode()));
         private final List<EventsListener> listeners = new ArrayList<>();
 
         void dispatchPlaybackPaused() {
-            long trackTime = time();
+            long trackTime = state.getPosition();
             for (EventsListener l : new ArrayList<>(listeners))
                 executorService.execute(() -> l.onPlaybackPaused(trackTime));
         }
 
         void dispatchPlaybackResumed() {
-            long trackTime = time();
+            long trackTime = state.getPosition();
             for (EventsListener l : new ArrayList<>(listeners))
                 executorService.execute(() -> l.onPlaybackResumed(trackTime));
         }
@@ -751,5 +761,22 @@ public void dispatchSeek(int pos) {
             for (EventsListener l : new ArrayList<>(listeners))
                 executorService.execute(() -> l.onTrackSeeked(pos));
         }
+
+        public void metadataAvailable() {
+            if (trackHandler == null) return;
+
+            Metadata.Track track = trackHandler.track();
+            Metadata.Episode episode = trackHandler.episode();
+            if (track == null && episode == null) return;
+
+            for (EventsListener l : new ArrayList<>(listeners))
+                executorService.execute(() -> l.onMetadataAvailable(track, episode));
+        }
+
+        public void playbackHaltStateChanged(boolean halted) {
+            long trackTime = state.getPosition();
+            for (EventsListener l : new ArrayList<>(listeners))
+                executorService.execute(() -> l.onPlaybackHaltStateChanged(halted, trackTime));
+        }
     }
 }