Trim down state to 80 songs (fixes #93)

Author: devgianlu

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

@@ -787,6 +787,7 @@ void loadStation(@NotNull MercuryRequests.StationsWrapper station) {
             state.setPlayingTrackIndex(0);
             state.clearTrack();
             state.addAllTrack(station.tracks());
+            SpotifyIrc.trimTracks(state);
         }
 
         int lastQueuedSongIndex() {
@@ -844,6 +845,7 @@ private void loadPage(@NotNull Remote3Page page, @Nullable TrackSelector selecto
             }
 
             state.setPlayingTrackIndex(selector == null ? 0 : selector.playingIndex());
+            SpotifyIrc.trimTracks(state);
 
             if (state.getShuffle()) shuffleTracks(selector == null || !selector.findMatch());
         }
@@ -919,6 +921,7 @@ void updateContext(@NotNull Remote3Frame.Context context) throws SpotifyContext.
             }
 
             state.setPlayingTrackIndex(selector.playingIndex());
+            SpotifyIrc.trimTracks(state);
 
             if (page.nextPageUrl != null && playablesProvider instanceof StationProvider)
                 ((StationProvider) playablesProvider).knowsNextPageUrl(page.nextPageUrl);
@@ -947,6 +950,7 @@ void setQueue(@NotNull Remote3Frame frame) {
             }
 
             state.setPlayingTrackIndex(index);
+            SpotifyIrc.trimTracks(state);
         }
 
         void addToQueue(@NotNull Remote3Frame frame) {

core/src/main/java/xyz/gianlu/librespot/player/tracks/PlaylistProvider.java

@@ -9,6 +9,7 @@
 import xyz.gianlu.librespot.mercury.model.PlayableId;
 import xyz.gianlu.librespot.mercury.model.TrackId;
 import xyz.gianlu.librespot.player.remote.Remote3Track;
+import xyz.gianlu.librespot.spirc.SpotifyIrc;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,6 +66,8 @@ public void shuffleTracks(@NotNull Random random, boolean fully) {
 
         state.clearTrack();
         state.addAllTrack(tracks);
+        SpotifyIrc.trimTracks(state);
+
         LOGGER.trace("Shuffled, seed: " + shuffleSeed);
     }
 
@@ -108,9 +111,9 @@ public void unshuffleTracks() {
             Spirc.TrackRef current = state.getTrack(state.getPlayingTrackIndex());
             String currentTrackUri = TrackId.fromTrackRef(current).toSpotifyUri();
 
-            List<Spirc.TrackRef> rebuildState = new ArrayList<>(80);
+            List<Spirc.TrackRef> rebuildState = new ArrayList<>(SpotifyIrc.MAX_TRACKS);
             boolean add = false;
-            int count = 80;
+            int count = SpotifyIrc.MAX_TRACKS;
             for (Remote3Track track : tracks) {
                 if (add || track.uri.equals(currentTrackUri)) {
                     rebuildState.add(track.toTrackRef());
@@ -127,6 +130,7 @@ public void unshuffleTracks() {
             state.clearTrack();
             state.addAllTrack(rebuildState);
             state.setPlayingTrackIndex(0);
+            SpotifyIrc.trimTracks(state);
 
             LOGGER.trace("Unshuffled using context-resolve.");
         } else {

core/src/main/java/xyz/gianlu/librespot/player/tracks/StationProvider.java

@@ -13,6 +13,7 @@
 import xyz.gianlu.librespot.mercury.MercuryRequests;
 import xyz.gianlu.librespot.mercury.RawMercuryRequest;
 import xyz.gianlu.librespot.mercury.model.TrackId;
+import xyz.gianlu.librespot.spirc.SpotifyIrc;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -72,6 +73,8 @@ private void getNextPage() throws IOException {
                     .setGid(ByteString.copyFrom(TrackId.fromUri(uri).getGid()))
                     .build());
         }
+
+        SpotifyIrc.trimTracks(state);
     }
 
     private void resolveContext() throws IOException, MercuryClient.MercuryException {

core/src/main/java/xyz/gianlu/librespot/spirc/SpotifyIrc.java

@@ -31,6 +31,14 @@ public class SpotifyIrc implements Closeable {
     private final Session session;
     private final Spirc.DeviceState.Builder deviceState;
     private SpircListener internalListener;
+    public static final int MAX_TRACKS = 80;
+
+    public static void trimTracks(@NotNull Spirc.State.Builder state) {
+        if (state.getTrackCount() <= MAX_TRACKS) return;
+
+        for (int i = state.getTrackCount() - 1; i >= MAX_TRACKS; i--)
+            state.removeTrack(i);
+    }
 
     public SpotifyIrc(@NotNull Session session) {
         this.session = session;