Merge remote-tracking branch 'origin/dev' into dev

Author: devgianlu

api/pom.xml

@@ -99,7 +99,7 @@
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
-            <version>2.2.3.Final</version>
+            <version>2.2.7.Final</version>
         </dependency>
     </dependencies>
 </project>

player/src/main/java/xyz/gianlu/librespot/player/PlayerConfiguration.java

@@ -37,6 +37,7 @@ public final class PlayerConfiguration {
     // Output
     public final AudioOutput output;
     public final String outputClass;
+    public final Object[] outputClassParams;
     public final File outputPipe;
     public final File metadataPipe;
     public final String[] mixerSearchKeywords;
@@ -52,7 +53,7 @@ public final class PlayerConfiguration {
     public final File localFilesPath;
 
     private PlayerConfiguration(AudioQuality preferredQuality, boolean enableNormalisation, float normalisationPregain, boolean autoplayEnabled, int crossfadeDuration, boolean preloadEnabled,
-                                AudioOutput output, String outputClass, File outputPipe, File metadataPipe, String[] mixerSearchKeywords, boolean logAvailableMixers, int releaseLineDelay,
+                                AudioOutput output, String outputClass, Object[] outputClassParams, File outputPipe, File metadataPipe, String[] mixerSearchKeywords, boolean logAvailableMixers, int releaseLineDelay,
                                 int initialVolume, int volumeSteps, boolean bypassSinkVolume, File localFilesPath) {
         this.preferredQuality = preferredQuality;
         this.enableNormalisation = enableNormalisation;
@@ -61,6 +62,7 @@ private PlayerConfiguration(AudioQuality preferredQuality, boolean enableNormali
         this.crossfadeDuration = crossfadeDuration;
         this.output = output;
         this.outputClass = outputClass;
+        this.outputClassParams = outputClassParams;
         this.outputPipe = outputPipe;
         this.metadataPipe = metadataPipe;
         this.mixerSearchKeywords = mixerSearchKeywords;
@@ -89,6 +91,7 @@ public final static class Builder {
         // Output
         private AudioOutput output = AudioOutput.MIXER;
         private String outputClass;
+        private Object[] outputClassParams;
         private File outputPipe;
         private File metadataPipe;
         private String[] mixerSearchKeywords;
@@ -141,6 +144,11 @@ public Builder setOutputClass(String outputClass) {
             return this;
         }
 
+        public Builder setOutputClassParams(Object[] outputClassParams) {
+            this.outputClassParams = outputClassParams;
+            return this;
+        }
+
         public Builder setOutputPipe(File outputPipe) {
             this.outputPipe = outputPipe;
             return this;
@@ -200,7 +208,7 @@ public Builder setLocalFilesPath(File localFilesPath) {
         @Contract(value = " -> new", pure = true)
         public @NotNull PlayerConfiguration build() {
             return new PlayerConfiguration(preferredQuality, enableNormalisation, normalisationPregain, autoplayEnabled, crossfadeDuration, preloadEnabled,
-                    output, outputClass, outputPipe, metadataPipe, mixerSearchKeywords, logAvailableMixers, releaseLineDelay,
+                    output, outputClass, outputClassParams, outputPipe, metadataPipe, mixerSearchKeywords, logAvailableMixers, releaseLineDelay,
                     initialVolume, volumeSteps, bypassSinkVolume, localFilesPath);
         }
     }

player/src/main/java/xyz/gianlu/librespot/player/mixing/AudioSink.java

@@ -61,7 +61,7 @@ public AudioSink(@NotNull PlayerConfiguration conf, @NotNull Listener listener)
                 if (conf.outputClass == null || conf.outputClass.isEmpty())
                     throw new IllegalArgumentException("Custom output sink class not configured!");
 
-                output = initCustomOutputSink(conf.outputClass);
+                output = initCustomOutputSink(conf.outputClass, conf.outputClassParams);
                 break;
             default:
                 throw new IllegalArgumentException("Unknown output: " + conf.output);