Handling stream error better

Author: devgianlu

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

@@ -17,4 +17,6 @@ public interface AudioFile {
     void cacheFailedHeader(@NotNull AudioFile file);
 
     void headerEnd(boolean cached);
+
+    void streamError(short code);
 }

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

@@ -62,6 +62,11 @@ public synchronized void headerEnd(boolean cached) {
         }
     }
 
+    @Override
+    public void streamError(short code) {
+        LOGGER.fatal(String.format("Stream error, code: %d", code));
+    }
+
     @Override
     public synchronized void cacheFailedChunk(int index, @NotNull AudioFile file) {
         // Never called

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

@@ -4,8 +4,8 @@
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.common.Utils;
-import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.common.proto.Metadata;
+import xyz.gianlu.librespot.core.Session;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -119,6 +119,11 @@ public void headerEnd(boolean cached) {
         // Never called
     }
 
+    @Override
+    public void streamError(short code) {
+        LOGGER.fatal(String.format("Stream error, code: %d", code));
+    }
+
     private class ChunksBuffer {
         private final int size;
         private final byte[][] buffer;

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

@@ -76,7 +76,14 @@ protected void appendToQueue(@NotNull Packet packet) {
 
             channel.addToQueue(payload);
         } else if (packet.is(Packet.Type.ChannelError)) {
-            LOGGER.fatal(String.format("Stream error, payload: %s", Utils.bytesToHex(packet.payload)));
+            short id = payload.getShort();
+            Channel channel = channels.get(id);
+            if (channel == null) {
+                LOGGER.warn(String.format("Dropping channel error, id: %d, code: %d", id, payload.getShort()));
+                return;
+            }
+
+            channel.streamError(payload.getShort());
         } else {
             LOGGER.warn(String.format("Couldn't handle packet, cmd: %s, payload: %s", packet.type(), Utils.bytesToHex(packet.payload)));
         }
@@ -147,6 +154,10 @@ private void addToQueue(@NotNull ByteBuffer payload) {
             queue.add(payload);
         }
 
+        void streamError(short code) {
+            file.streamError(code);
+        }
+
         private class Handler implements Runnable {
 
             @Override