Removed #time() method and disabled preload for episodes

Author: devgianlu

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

@@ -37,10 +37,6 @@ public class PlayerRunner implements Runnable {
         LOGGER.trace(String.format("Player ready for playback, codec: %s, fileId: %s", audioFile.codec(), audioFile.describe()));
     }
 
-    int time() {
-        return codec.time();
-    }
-
     @Override
     public void run() {
         codec.run();

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

@@ -76,7 +76,7 @@ public final void run() {
 
     protected abstract void readBody() throws IOException, LineUnavailableException, CodecException;
 
-    public abstract int time();
+    public abstract int time() throws CannotGetTimeException;
 
     public void cleanup() {
         try {
@@ -104,12 +104,24 @@ public void seek(int positionMs) {
     }
 
     protected final void checkPreload() {
-        if (preloadEnabled && !calledPreload && !stopped && duration - time() <= TRACK_PRELOAD_THRESHOLD) {
+        int time;
+        try {
+            time = time();
+        } catch (CannotGetTimeException ex) {
+            return;
+        }
+
+        if (preloadEnabled && !calledPreload && !stopped && duration - time <= TRACK_PRELOAD_THRESHOLD) {
             calledPreload = true;
             listener.preloadNextTrack();
         }
     }
 
+    public static class CannotGetTimeException extends Exception {
+        protected CannotGetTimeException() {
+        }
+    }
+
     public static class CodecException extends Exception {
 
         CodecException() {

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

@@ -16,17 +16,14 @@
 public class Mp3Codec extends Codec {
     private final LinesHolder.LineWrapper outputLine;
     private final byte[] buffer = new byte[BUFFER_SIZE];
-    private final int size;
     private final Sound sound;
-    private long readSoFar = 0;
 
     public Mp3Codec(@NotNull GeneralAudioStream audioFile, @Nullable NormalizationData normalizationData, Player.@NotNull Configuration conf,
                     PlayerRunner.@NotNull Listener listener, @NotNull LinesHolder lines, int duration) throws CodecException, IOException, LinesHolder.MixerException {
         super(audioFile, normalizationData, conf, listener, lines, duration);
 
         skipMp3Tags(audioIn);
         sound = new Sound(audioIn);
-        size = sound.available();
 
         try {
             outputLine = lines.getLineFor(conf, sound.getAudioFormat());
@@ -72,8 +69,6 @@ protected void readBody() throws LineUnavailableException, IOException {
                 int count = sound.read(buffer);
                 if (count == -1) break;
 
-                readSoFar += count;
-
                 line.write(buffer, 0, count);
             } else {
                 line.stop();
@@ -90,8 +85,8 @@ protected void readBody() throws LineUnavailableException, IOException {
     }
 
     @Override
-    public int time() {
-        return (int) (readSoFar * duration / size); // FIXME: Completely wrong when we'll be able to seek
+    public int time() throws CannotGetTimeException {
+       throw new CannotGetTimeException();
     }
 
     @Override

core/src/main/java/xyz/gianlu/librespot/player/decrypt/NoopAudioDecrypt.java

@@ -7,7 +7,7 @@ public final class NoopAudioDecrypt implements AudioDecrypt {
     @Override
     public void decryptChunk(int chunkIndex, byte[] in, byte[] out) {
         if (in.length != out.length)
-            throw new IllegalArgumentException(String.format("Buffers have different lengths! {in: %d, out: %d}", in.length, out.length));
+            throw new IllegalArgumentException(String.format("Buffers have different lengths! {index: %d, in: %d, out: %d}", chunkIndex, in.length, out.length));
 
         System.arraycopy(in, 0, out, 0, in.length);
     }