From 45858df8a3ee0949d3a87891561ce6b335907abe Mon Sep 17 00:00:00 2001
From: dann-merlin <merlin.danner@fau.de>
Date: Sat, 22 Feb 2020 12:44:13 +0100
Subject: [PATCH] Volume configurable range 0-100

---
 src/config.rs  | 2 +-
 src/spotify.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index f8dc0f2..b93b2d3 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -17,7 +17,7 @@ pub struct Config {
 
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct SavedState {
-    pub volume: Option<u16>,
+    pub volume: Option<u8>,
     pub shuffle: Option<bool>,
     pub repeat: Option<String>,
 }
diff --git a/src/spotify.rs b/src/spotify.rs
index 168199a..d820728 100644
--- a/src/spotify.rs
+++ b/src/spotify.rs
@@ -223,7 +223,7 @@ impl Spotify {
         let (user_tx, user_rx) = oneshot::channel();
         let volume = match &cfg.saved_state {
             Some(state) => match state.volume {
-                Some(vol) => vol,
+                Some(vol) => ((std::cmp::min(vol, 100) as f32)/100.0 * (0xFFFF as f32)).ceil() as u16,
                 None => 0xFFFF as u16,
             },
             None => 0xFFFF as u16,