Empty buffers when seeking

Author: devgianlu

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

@@ -423,12 +423,11 @@ private void loadTrack(boolean play, @NotNull PushToMixerReason reason) {
                 }
 
                 state.setState(true, !play, false);
-                state.updated();
             } else {
                 state.setState(true, !play, true);
-                state.updated();
             }
 
+            state.updated();
             events.trackChanged();
 
             if (!play) {
@@ -447,17 +446,16 @@ private void loadTrack(boolean play, @NotNull PushToMixerReason reason) {
 
                     trackHandler.seek(state.getPosition());
                     state.setState(true, !play, false);
-                    state.updated();
                 } else {
                     state.setState(true, !play, true);
-                    state.updated();
                 }
+
             } else {
                 trackHandler = runner.load(id, state.getPosition());
                 state.setState(true, !play, true);
-                state.updated();
             }
 
+            state.updated();
             events.trackChanged();
 
             if (play) {

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

@@ -167,7 +167,7 @@ public void run() {
 
                 try {
                     int count = mixing.read(buffer);
-                    output.write(buffer, 0, count);
+                    output.write(buffer, count);
                 } catch (IOException | LineUnavailableException ex) {
                     if (closed) break;
 
@@ -305,6 +305,10 @@ private void acquireLine() throws LineUnavailableException {
             if (lastVolume != -1) setVolume(lastVolume);
         }
 
+        void flush() {
+            if (line != null) line.flush();
+        }
+
         void stop() {
             if (line != null) line.stop();
         }
@@ -318,10 +322,10 @@ boolean start() {
             return false;
         }
 
-        void write(byte[] buffer, int off, int len) throws IOException, LineUnavailableException {
+        void write(byte[] buffer, int len) throws IOException, LineUnavailableException {
             if (type == Type.MIXER) {
                 acquireLine();
-                line.write(buffer, off, len);
+                line.write(buffer, 0, len);
             } else if (type == Type.PIPE) {
                 if (out == null) {
                     if (!pipe.exists()) {
@@ -341,9 +345,9 @@ void write(byte[] buffer, int off, int len) throws IOException, LineUnavailableE
                     out = new FileOutputStream(pipe, true);
                 }
 
-                out.write(buffer, off, len);
+                out.write(buffer, 0, len);
             } else if (type == Type.STREAM) {
-                out.write(buffer, off, len);
+                out.write(buffer, 0, len);
             } else {
                 throw new IllegalStateException();
             }
@@ -471,6 +475,9 @@ public void run() {
 
                             if (handler.codec != null) {
                                 if (shouldAbortCrossfade) handler.abortCrossfade();
+
+                                output.flush();
+                                if (handler.out != null) handler.out.stream().emptyBuffer();
                                 handler.codec.seek((Integer) cmd.args[0]);
                             }
 

core/src/main/java/xyz/gianlu/librespot/player/mixing/CircularBuffer.java

@@ -121,6 +121,7 @@ protected int readInternal() {
      *
      * @return a byte from the buffer.
      */
+    @TestOnly
     public int read() throws IOException {
         if (closed) return -1;
 
@@ -173,6 +174,23 @@ public boolean full() {
         return tail + 1 == head || (head == 0 && tail == data.length - 1);
     }
 
+    /**
+     * Empties the buffer from its data, the data is not erased (will be overridden anyway).
+     */
+    public void empty() {
+        lock.lock();
+
+        try {
+            head = 0;
+            tail = 0;
+
+            awaitData.signalAll();
+            awaitSpace.signalAll();
+        } finally {
+            lock.unlock();
+        }
+    }
+
     @Override
     public void close() {
         closed = true;

core/src/main/java/xyz/gianlu/librespot/player/mixing/MixingLine.java

@@ -92,10 +92,10 @@ public interface MixingOutput {
         void clear();
 
         @NotNull
-        OutputStream stream();
+        LowLevelStream stream();
     }
 
-    private static abstract class LowLevelStream extends OutputStream {
+    public static abstract class LowLevelStream extends OutputStream {
         private final CircularBuffer buffer;
 
         LowLevelStream(@NotNull CircularBuffer buffer) {
@@ -111,6 +111,10 @@ public final void write(int b) {
         public final void write(@NotNull byte[] b, int off, int len) throws IOException {
             buffer.write(b, off, len);
         }
+
+        public final void emptyBuffer() {
+            buffer.empty();
+        }
     }
 
     public class FirstOutputStream extends LowLevelStream implements MixingOutput {
@@ -149,7 +153,7 @@ public void clear() {
         }
 
         @Override
-        public @NotNull OutputStream stream() {
+        public @NotNull LowLevelStream stream() {
             if (fout != this) throw new IllegalArgumentException();
             return this;
         }
@@ -192,7 +196,7 @@ public void clear() {
         }
 
         @Override
-        public @NotNull OutputStream stream() {
+        public @NotNull LowLevelStream stream() {
             if (sout != this) throw new IllegalArgumentException();
             return this;
         }