Implement volume change from the Spotify application

Author: michaelherger

src/lms.rs

@@ -44,6 +44,11 @@ impl LMS {
     self.request(r#"["spottyconnect","change"]"#.to_string())
   }
 
+  pub fn volume(&self, volume: u16) {
+    // we're not using the volume here, as LMS will read player state anyway
+    self.request(format!(r#"["spottyconnect","volume",{}]"#, volume.to_string()))
+  }
+
   pub fn request(&self, command: String) {
     debug!("Base URL to talk to LMS: {}", self.base_url.clone().unwrap());
 

src/player.rs

@@ -40,6 +40,7 @@ enum PlayerCommand {
     Pause,
     Stop,
     Seek(u32),
+    Volume(u32),
 }
 
 impl Player {
@@ -96,6 +97,10 @@ impl Player {
     pub fn seek(&self, position_ms: u32) {
         self.command(PlayerCommand::Seek(position_ms));
     }
+
+    pub fn set_volume(&self, volume: u32) {
+        self.command(PlayerCommand::Volume(volume));
+    }
 }
 
 type Decoder = vorbis::Decoder<Subfile<AudioDecrypt<AudioFile>>>;
@@ -286,6 +291,25 @@ impl PlayerInternal {
                 self.run_onchange();
             }
 
+            PlayerCommand::Volume(mut volume) => {
+                if self.lms.is_configured() {
+                  if volume > 0 {
+                    volume = volume * 100 / std::u16::MAX as u32;
+                  } else {
+                    volume = 0;
+                  }
+
+                  // LMS volume is 0-100. We need to convert
+                  let v2 = if volume > 100 {
+                    Some(100 as u16)
+                  } else {
+                    Some(volume as u16)
+                  };
+
+                  self.lms.volume(v2.unwrap());
+                }
+            }
+
             PlayerCommand::Play => {
                 if let PlayerState::Paused { .. } = self.state {
                     self.state.paused_to_playing();
@@ -453,6 +477,11 @@ impl ::std::fmt::Debug for PlayerCommand {
                  .field(&position)
                  .finish()
             }
+            PlayerCommand::Volume(volume) => {
+                f.debug_tuple("Volume")
+                 .field(&volume)
+                 .finish()
+            }
         }
     }
 }

src/spirc.rs

@@ -410,6 +410,7 @@ impl SpircTask {
 
             MessageType::kMessageTypeVolume => {
                 let volume = frame.get_volume();
+                self.player.set_volume(volume);
                 self.device.set_volume(volume);
                 self.mixer.set_volume(frame.get_volume() as u16);
                 self.notify(None);