Added trackTime parameter to events + modified player/current endpoint to include track time

Author: devgianlu

api/README.md

@@ -14,7 +14,7 @@ This module depends on `librespot-core` and provides an API to interact with the
 - `POST \player\set-volume` Set volume to a given `volume` value from 0 to 65536.
 - `POST \player\volume-up` Up the volume a little bit.
 - `POST \player\volume-down` Lower the volume a little bit.
-- `POST \player\current` Retrieve information about the current track.
+- `POST \player\current` Retrieve information about the current track (metadata and time).
 
 ### Metadata
 - `POST \metadata\{type}\{uri}` Retrieve metadata. `type` can be one of `episode`, `track`, `album`, `show`, `artist`, `uri` is the standard Spotify uri.
@@ -27,7 +27,7 @@ The currently available events are:
 - `trackChanged`
 - `playbackPaused`
 - `playbackResumed`
-
+- `trackSeeked`
 
 ## Examples
 

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

@@ -46,16 +46,26 @@ public void onTrackChanged(@NotNull PlayableId id, Metadata.@Nullable Track trac
     }
 
     @Override
-    public void onPlaybackPaused() {
+    public void onPlaybackPaused(long trackTime) {
         JsonObject obj = new JsonObject();
         obj.addProperty("event", "playbackPaused");
+        obj.addProperty("trackTime", trackTime);
         dispatch(obj);
     }
 
     @Override
-    public void onPlaybackResumed() {
+    public void onPlaybackResumed(long trackTime) {
         JsonObject obj = new JsonObject();
         obj.addProperty("event", "playbackResumed");
+        obj.addProperty("trackTime", trackTime);
+        dispatch(obj);
+    }
+
+    @Override
+    public void onTrackSeeked(long trackTime) {
+        JsonObject obj = new JsonObject();
+        obj.addProperty("event", "trackSeeked");
+        obj.addProperty("trackTime", trackTime);
         dispatch(obj);
     }
 }

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

@@ -59,25 +59,28 @@ private void load(HttpServerExchange exchange, @Nullable String uri, boolean pla
     private void current(HttpServerExchange exchange) {
         PlayableId id = session.player().currentPlayableId();
 
-        JsonObject obj;
+        JsonObject obj = new JsonObject();
+        if (id != null) obj.addProperty("current", id.toSpotifyUri());
+
+        long time = session.player().time();
+        obj.addProperty("trackTime", time);
+
         if (id instanceof TrackId) {
             Metadata.Track track = session.player().currentTrack();
             if (track == null) {
                 Utils.internalError(exchange, "Missing track metadata. Try again.");
                 return;
             }
 
-            obj = ProtobufToJson.convert(track);
-            obj.addProperty("uri", id.toSpotifyUri());
+            obj.add("track", ProtobufToJson.convert(track));
         } else if (id instanceof EpisodeId) {
             Metadata.Episode episode = session.player().currentEpisode();
             if (episode == null) {
                 Utils.internalError(exchange, "Missing episode metadata. Try again.");
                 return;
             }
 
-            obj = ProtobufToJson.convert(episode);
-            obj.addProperty("uri", id.toSpotifyUri());
+            obj.add("episode", ProtobufToJson.convert(episode));
         } else {
             Utils.internalError(exchange, "Invalid PlayableId: " + id);
             return;

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

@@ -46,7 +46,7 @@ public class Player implements Closeable, DeviceStateHandler.Listener, PlayerRun
     private TrackHandler trackHandler;
     private TrackHandler crossfadeHandler;
     private TrackHandler preloadTrackHandler;
-    private ScheduledFuture releaseLineFuture = null;
+    private ScheduledFuture<?> releaseLineFuture = null;
 
     public Player(@NotNull Player.Configuration conf, @NotNull Session session) {
         this.conf = conf;
@@ -384,6 +384,7 @@ public void playbackResumedFromHalt(@NotNull TrackHandler handler, int chunk, lo
     private void handleSeek(int pos) {
         state.setPosition(pos);
         if (trackHandler != null) trackHandler.seek(pos);
+        events.dispatchSeek(pos);
     }
 
     private void panicState() {
@@ -697,23 +698,27 @@ public interface EventsListener {
 
         void onTrackChanged(@NotNull PlayableId id, @Nullable Metadata.Track track, @Nullable Metadata.Episode episode);
 
-        void onPlaybackPaused();
+        void onPlaybackPaused(long trackTime);
 
-        void onPlaybackResumed();
+        void onPlaybackResumed(long trackTime);
+
+        void onTrackSeeked(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();
             for (EventsListener l : new ArrayList<>(listeners))
-                executorService.execute(l::onPlaybackPaused);
+                executorService.execute(() -> l.onPlaybackPaused(trackTime));
         }
 
         void dispatchPlaybackResumed() {
+            long trackTime = time();
             for (EventsListener l : new ArrayList<>(listeners))
-                executorService.execute(l::onPlaybackResumed);
+                executorService.execute(() -> l.onPlaybackResumed(trackTime));
         }
 
         void dispatchContextChanged() {
@@ -741,5 +746,10 @@ void dispatchTrackChanged() {
             for (EventsListener l : new ArrayList<>(listeners))
                 executorService.execute(() -> l.onTrackChanged(id, track, episode));
         }
+
+        public void dispatchSeek(int pos) {
+            for (EventsListener l : new ArrayList<>(listeners))
+                executorService.execute(() -> l.onTrackSeeked(pos));
+        }
     }
 }