Make sure to update pcm_offset when seeking + fixed issue with time bar

Author: devgianlu

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

@@ -65,12 +65,25 @@ public final synchronized void reset() {
         pos = mark;
     }
 
+    public final synchronized int pos() {
+        return pos;
+    }
+
+    public final synchronized void seek(int where) throws IOException {
+        if (where < 0) throw new IllegalArgumentException();
+        if (closed) throw new IOException("Stream is closed!");
+        pos = where;
+
+        checkAvailability(pos / CHUNK_SIZE, false, false);
+    }
+
     @Override
     public final synchronized long skip(long n) throws IOException {
+        if (n < 0) throw new IllegalArgumentException();
         if (closed) throw new IOException("Stream is closed!");
 
         long k = size() - pos;
-        if (n < k) k = n < 0 ? 0 : n;
+        if (n < k) k = n;
         pos += k;
 
         int chunk = pos / CHUNK_SIZE;

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

@@ -3,14 +3,12 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.player.codecs.SuperAudioFormat;
 
-import java.io.InputStream;
-
 /**
  * @author Gianlu
  */
 public interface GeneralAudioStream {
     @NotNull
-    InputStream stream();
+    AbsChunkedInputStream stream();
 
     @NotNull
     SuperAudioFormat codec();

core/src/main/java/xyz/gianlu/librespot/player/codecs/Codec.java

@@ -3,14 +3,14 @@
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.player.AbsChunkedInputStream;
 import xyz.gianlu.librespot.player.GeneralAudioStream;
 import xyz.gianlu.librespot.player.NormalizationData;
 import xyz.gianlu.librespot.player.Player;
 
 import javax.sound.sampled.AudioFormat;
 import java.io.Closeable;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
@@ -19,13 +19,14 @@
 public abstract class Codec implements Closeable {
     public static final int BUFFER_SIZE = 2048;
     private static final Logger LOGGER = Logger.getLogger(Codec.class);
-    protected final InputStream audioIn;
+    protected final AbsChunkedInputStream audioIn;
     protected final float normalizationFactor;
     protected final int duration;
     private final AudioFormat dstFormat;
     protected volatile boolean closed = false;
     private AudioFormat format;
     private StreamConverter converter = null;
+    protected int seekZero = 0;
 
     Codec(@NotNull AudioFormat dstFormat, @NotNull GeneralAudioStream audioFile, @Nullable NormalizationData normalizationData, @NotNull Player.Configuration conf, int duration) {
         this.dstFormat = dstFormat;
@@ -55,10 +56,6 @@ public final int readSome(@NotNull OutputStream out) throws IOException, CodecEx
      */
     public abstract int time() throws CannotGetTimeException;
 
-    public final int remaining() throws CannotGetTimeException {
-        return duration - time();
-    }
-
     @Override
     public void close() throws IOException {
         closed = true;
@@ -69,7 +66,7 @@ public void seek(int positionMs) {
         if (positionMs < 0) positionMs = 0;
 
         try {
-            audioIn.reset();
+            audioIn.seek(seekZero);
             if (positionMs > 0) {
                 int skip = Math.round(audioIn.available() / (float) duration * positionMs);
                 if (skip > audioIn.available()) skip = audioIn.available();

core/src/main/java/xyz/gianlu/librespot/player/codecs/VorbisCodec.java

@@ -49,8 +49,7 @@ public VorbisCodec(@NotNull AudioFormat dstFormat, @NotNull GeneralAudioStream a
         this.buffer = joggSyncState.data;
 
         readHeader();
-
-        audioIn.mark(-1);
+        seekZero = audioIn.pos();
 
         convertedBuffer = new byte[CONVERTED_BUFFER_SIZE];
 
@@ -63,6 +62,28 @@ public VorbisCodec(@NotNull AudioFormat dstFormat, @NotNull GeneralAudioStream a
         setAudioFormat(new AudioFormat(jorbisInfo.rate, 16, jorbisInfo.channels, true, false));
     }
 
+    @Override
+    public void seek(int positionMs) {
+        super.seek(positionMs);
+        if (positionMs == 0) return;
+
+        audioIn.mark(-1);
+        long oldOffset = pcm_offset;
+        while (oldOffset == pcm_offset || pcm_offset <= 0) {
+            try {
+                if (readInternal(new OutputStream() {
+                    @Override
+                    public void write(int b) {
+                        // Noop
+                    }
+                }) == -1) break;
+            } catch (IOException | CodecException ex) {
+                break;
+            }
+        }
+        audioIn.reset();
+    }
+
     @Override
     public int time() {
         return (int) (((float) pcm_offset / (float) jorbisInfo.rate) * 1000f);

core/src/main/java/xyz/gianlu/librespot/player/feeders/cdn/CdnManager.java

@@ -264,7 +264,7 @@ public void writeChunk(@NotNull byte[] chunk, int chunkIndex, boolean cached) th
         }
 
         @Override
-        public @NotNull InputStream stream() {
+        public @NotNull AbsChunkedInputStream stream() {
             return internalStream;
         }
 

core/src/main/java/xyz/gianlu/librespot/player/feeders/storage/AudioFileStreaming.java

@@ -19,7 +19,6 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -60,7 +59,7 @@ public class AudioFileStreaming implements AudioFile, GeneralAudioStream {
     }
 
     @NotNull
-    public InputStream stream() {
+    public AbsChunkedInputStream stream() {
         if (chunksBuffer == null) throw new IllegalStateException("Stream not open!");
         return chunksBuffer.stream();
     }
@@ -191,7 +190,7 @@ void writeChunk(@NotNull byte[] chunk, int chunkIndex) throws IOException {
         }
 
         @NotNull
-        InputStream stream() {
+        AbsChunkedInputStream stream() {
             return internalStream;
         }