Cleanup of MixingLine + fix stuttering when skipping next

Author: devgianlu

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

@@ -103,9 +103,6 @@ public final void write(int b) {
         public abstract void clear();
 
         public abstract void emptyBuffer();
-
-        @NotNull
-        public abstract MixingOutput stream();
     }
 
     public class FirstOutputStream extends MixingOutput {
@@ -119,21 +116,21 @@ public void write(@NotNull byte[] b, int off, int len) {
         @Override
         public void toggle(boolean enabled) {
             if (enabled == fe) return;
-            if (enabled && (fout == null || fout != this)) throw new IllegalStateException();
+            if (enabled && (fout == null || fout != this)) return;
             fe = enabled;
             LOGGER.trace("Toggle first channel: " + enabled);
         }
 
         @Override
         public void gain(float gain) {
-            if (fout == null || fout != this) throw new IllegalStateException();
+            if (fout == null || fout != this) return;
             fg = gain;
         }
 
         @Override
         @SuppressWarnings("DuplicatedCode")
         public void clear() {
-            if (fout == null || fout != this) throw new IllegalStateException();
+            if (fout == null || fout != this) return;
 
             fg = 1;
             fe = false;
@@ -145,15 +142,9 @@ public void clear() {
             }
         }
 
-        @Override
-        public @NotNull MixingOutput stream() {
-            if (fout == null || fout != this) throw new IllegalStateException();
-            return this;
-        }
-
         @Override
         public void emptyBuffer() {
-            if (fout == null || fout != this) throw new IllegalStateException();
+            if (fout == null || fout != this) return;
             fcb.empty();
         }
     }
@@ -169,21 +160,21 @@ public void write(@NotNull byte[] b, int off, int len) {
         @Override
         public void toggle(boolean enabled) {
             if (enabled == se) return;
-            if (enabled && (sout == null || sout != this)) throw new IllegalStateException();
+            if (enabled && (sout == null || sout != this)) return;
             se = enabled;
             LOGGER.trace("Toggle second channel: " + enabled);
         }
 
         @Override
         public void gain(float gain) {
-            if (sout == null || sout != this) throw new IllegalStateException();
+            if (sout == null || sout != this) return;
             sg = gain;
         }
 
         @Override
         @SuppressWarnings("DuplicatedCode")
         public void clear() {
-            if (sout == null || sout != this) throw new IllegalStateException();
+            if (sout == null || sout != this) return;
 
             sg = 1;
             se = false;
@@ -195,15 +186,9 @@ public void clear() {
             }
         }
 
-        @Override
-        public @NotNull MixingOutput stream() {
-            if (sout == null || sout != this) throw new IllegalStateException();
-            return this;
-        }
-
         @Override
         public void emptyBuffer() {
-            if (sout == null || sout != this) throw new IllegalStateException();
+            if (sout == null || sout != this) return;
             scb.empty();
         }
     }

core/src/main/java/xyz/gianlu/librespot/player/playback/PlayerQueueEntry.java

@@ -172,7 +172,7 @@ int getTimeNoThrow() {
      */
     void seek(int pos) {
         seekTime = pos;
-        if (output != null) output.stream().emptyBuffer();
+        if (output != null) output.emptyBuffer();
     }
 
     /**
@@ -190,8 +190,6 @@ void setOutput(@NotNull MixingLine.MixingOutput output) {
             this.output = output;
             playbackLock.notifyAll();
         }
-
-        this.output.toggle(true);
     }
 
     /**
@@ -270,6 +268,7 @@ public void run() {
             }
 
             if (closed) break;
+            output.toggle(true);
 
             if (seekTime != -1) {
                 codec.seek(seekTime);
@@ -290,7 +289,7 @@ public void run() {
             }
 
             try {
-                if (codec.writeSomeTo(output.stream()) == -1) {
+                if (codec.writeSomeTo(output) == -1) {
                     try {
                         int time = codec.time();
                         LOGGER.debug("Player time offset is {}. {id: {}}", metadata.duration() - time, playbackId);
@@ -311,6 +310,7 @@ public void run() {
             }
         }
 
+        output.toggle(false);
         listener.playbackEnded(this);
         LOGGER.trace("{} terminated.", this);
     }