Added volumeStep to config (#214)

* Added volumeStep to config - with 16 notches by default (much cleaner to change volume using iphone up/down buttons).

* Use 64 volume steps for continuity

Co-authored-by: devgianlu <[email protected]>

Author: josephcarroll

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

@@ -284,6 +284,15 @@ public int initialVolume() {
         return vol;
     }
 
+    @Override
+    public int volumeSteps() {
+        int volumeSteps = config.get("player.volumeSteps");
+        if (volumeSteps < 0 || volumeSteps > PlayerRunner.VOLUME_MAX)
+            throw new IllegalArgumentException("Invalid volume steps: " + volumeSteps);
+
+        return volumeSteps;
+    }
+
     @Override
     public boolean autoplayEnabled() {
         return config.get("player.autoplayEnabled");

core/src/main/java/xyz/gianlu/librespot/connectstate/DeviceStateHandler.java

@@ -75,7 +75,7 @@ private static Connect.DeviceInfo.Builder initializeDeviceInfo(@NotNull Session
                         .setCanBePlayer(true).setGaiaEqConnectId(true).setSupportsLogout(true)
                         .setIsObservable(true).setCommandAcks(true).setSupportsRename(false)
                         .setSupportsPlaylistV2(true).setIsControllable(true).setSupportsTransferCommand(true)
-                        .setSupportsCommandRequest(true).setVolumeSteps(PlayerRunner.VOLUME_STEPS)
+                        .setSupportsCommandRequest(true).setVolumeSteps(session.conf().volumeSteps())
                         .setSupportsGzipPushes(true).setNeedsFullPlayerState(false)
                         .addSupportedTypes("audio/episode")
                         .addSupportedTypes("audio/track")

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

@@ -77,12 +77,16 @@ public void initState() {
 
     public void volumeUp() {
         if (state == null) return;
-        setVolume(Math.min(PlayerRunner.VOLUME_MAX, state.getVolume() + PlayerRunner.VOLUME_ONE_STEP));
+        setVolume(Math.min(PlayerRunner.VOLUME_MAX, state.getVolume() + oneVolumeStep()));
     }
 
     public void volumeDown() {
         if (state == null) return;
-        setVolume(Math.max(0, state.getVolume() - PlayerRunner.VOLUME_ONE_STEP));
+        setVolume(Math.max(0, state.getVolume() - oneVolumeStep()));
+    }
+
+    private int oneVolumeStep() {
+        return PlayerRunner.VOLUME_MAX / conf.volumeSteps();
     }
 
     public void setVolume(int val) {
@@ -755,6 +759,8 @@ public interface Configuration {
 
         int initialVolume();
 
+        int volumeSteps();
+
         boolean autoplayEnabled();
 
         int crossfadeDuration();

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

@@ -40,9 +40,7 @@
  * @author Gianlu
  */
 public class PlayerRunner implements Runnable, Closeable {
-    public static final int VOLUME_STEPS = 64;
     public static final int VOLUME_MAX = 65536;
-    public static final int VOLUME_ONE_STEP = VOLUME_MAX / VOLUME_STEPS;
     public static final AudioFormat OUTPUT_FORMAT = new AudioFormat(44100, 16, 2, true, false);
     private static final Logger LOGGER = Logger.getLogger(PlayerRunner.class);
     private static final AtomicInteger IDS = new AtomicInteger(0);

core/src/main/resources/default.toml

@@ -35,6 +35,7 @@ preferredAudioQuality = "VORBIS_160" # Preferred audio quality (VORBIS_96, VORBI
 enableNormalisation = true # Whether to apply the Spotify loudness normalisation
 normalisationPregain = +3.0 # Normalisation pregain in decibels (loud at +6, normal at +3, quiet at -5)
 initialVolume = 65536 # Initial volume (0-65536)
+volumeSteps = 64 # Number of volume notches
 logAvailableMixers = true # Log available mixers
 mixerSearchKeywords = "" # Mixer/backend search keywords (semicolon separated)
 crossfadeDuration = 0 # Crossfade overlap time (in milliseconds)
@@ -55,4 +56,4 @@ address = "" # The proxy hostname
 port = 0 # The proxy port
 auth = false # Whether authentication is enabled on the server
 username = "" # Basic auth username
-password = "" # Basic auth password
+password = "" # Basic auth password