Set initial volume

Author: devgianlu

conf.properties

@@ -26,6 +26,8 @@ preload.enabled=true
 player.preferredAudioQuality=VORBIS_160
 # Normalisation pregain
 player.normalisationPregain=0
+# Initial volume (0-65536)
+player.initialVolume=65536
 # Default unshuffle behaviour (can't unshuffle if client is loaded with shuffled playlist)
 player.defaultUnshuffleBehaviour=false
 # Log available mixers

core/src/main/java/xyz/gianlu/librespot/DefaultConfiguration.java

@@ -3,6 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.core.Session;
+import xyz.gianlu.librespot.player.PlayerRunner;
 import xyz.gianlu.librespot.player.StreamFeeder;
 
 import java.io.File;
@@ -42,6 +43,11 @@ public boolean logAvailableMixers() {
         return true;
     }
 
+    @Override
+    public int initialVolume() {
+        return PlayerRunner.VOLUME_MAX;
+    }
+
     @Override
     public boolean preloadEnabled() {
         return true;

core/src/main/java/xyz/gianlu/librespot/FileConfiguration.java

@@ -6,6 +6,7 @@
 import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.core.Session;
+import xyz.gianlu.librespot.player.PlayerRunner;
 import xyz.gianlu.librespot.player.StreamFeeder;
 
 import java.io.File;
@@ -61,6 +62,14 @@ private float getFloat(@NotNull String key, float fallback) {
         }
     }
 
+    private int getInt(@NotNull String key, int fallback) {
+        try {
+            return Integer.parseInt(properties.getProperty(key, String.valueOf(fallback)));
+        } catch (NumberFormatException ex) {
+            return fallback;
+        }
+    }
+
     @Contract("_, _, !null -> !null")
     private <E extends Enum<E>> E getEnum(@NotNull Class<E> clazz, @NotNull String key, @Nullable E fallback) {
         String val = properties.getProperty(key, null);
@@ -126,6 +135,17 @@ public boolean logAvailableMixers() {
         return getBoolean("player.logAvailableMixers", defaults.logAvailableMixers());
     }
 
+    @Override
+    public int initialVolume() {
+        int vol = getInt("player.initialVolume", defaults.initialVolume());
+        if (vol < 0 || vol > PlayerRunner.VOLUME_MAX) {
+            LOGGER.warn("Invalid volume: " + vol);
+            return defaults.initialVolume();
+        } else {
+            return vol;
+        }
+    }
+
     @Override
     public @Nullable String deviceName() {
         return properties.getProperty("deviceName", null);

core/src/main/java/xyz/gianlu/librespot/core/Session.java

@@ -394,6 +394,11 @@ private void reconnect() {
         }
     }
 
+    @NotNull
+    public AbsConfiguration conf() {
+        return inner.configuration;
+    }
+
     public enum DeviceType {
         Unknown(0, "unknown"),
         Computer(1, "computer"),

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

@@ -387,6 +387,8 @@ public interface Configuration {
         String[] mixerSearchKeywords();
 
         boolean logAvailableMixers();
+
+        int initialVolume();
     }
 
     private class StateWrapper {

core/src/main/java/xyz/gianlu/librespot/spirc/SpotifyIrc.java

@@ -10,6 +10,7 @@
 import xyz.gianlu.librespot.mercury.MercuryClient;
 import xyz.gianlu.librespot.mercury.RawMercuryRequest;
 import xyz.gianlu.librespot.mercury.SubListener;
+import xyz.gianlu.librespot.player.Player;
 import xyz.gianlu.librespot.player.PlayerRunner;
 
 import java.io.Closeable;
@@ -32,21 +33,20 @@ public class SpotifyIrc implements Closeable {
     public SpotifyIrc(@NotNull Session session) {
         this.session = session;
         this.uri = String.format("hm://remote/user/%s/", session.apWelcome().getCanonicalUsername());
-        this.deviceState = initializeDeviceState();
+        this.deviceState = initializeDeviceState(session.conf());
     }
 
     public void subscribe() throws IOException, IrcException, MercuryClient.PubSubException {
         session.mercury().subscribe(uri, internalListener = new SpircListener());
-
         send(Spirc.MessageType.kMessageTypeHello);
     }
 
     @NotNull
-    private Spirc.DeviceState.Builder initializeDeviceState() {
+    private Spirc.DeviceState.Builder initializeDeviceState(@NotNull Player.Configuration conf) {
         return Spirc.DeviceState.newBuilder()
                 .setCanPlay(true)
                 .setIsActive(false)
-                .setVolume(PlayerRunner.VOLUME_MAX)
+                .setVolume(conf.initialVolume())
                 .setName(session.deviceName())
                 .setSwVersion(Version.versionString())
                 .addCapabilities(Spirc.Capability.newBuilder()