Add volume slider

data/dev.alextren.Spot.gschema.xml

@@ -52,5 +52,9 @@
       <default>0</default>
       <summary>Port to communicate with Spotify's server (access point). Setting to 0 (default) allows Spot to use servers running on any port.</summary>
     </key>
+    <key name="volume" type='d'>
+    <default>0.7</default>
+    <summary>Volume</summary>
+    </key>
   </schema>
-</schemalist>
+</schemalist>

src/app/components/playback/component.rs

@@ -71,6 +71,11 @@ impl PlaybackModel {
         self.dispatcher
             .dispatch(PlaybackAction::Seek(position).into());
     }
+
+    fn change_volume(&self, volume: f64) {
+        self.dispatcher
+            .dispatch(PlaybackAction::SetVolume(volume).into())
+    }
 }
 
 pub struct PlaybackControl {
@@ -90,6 +95,9 @@ impl PlaybackControl {
         widget.connect_repeat(clone!(@weak model => move || model.toggle_repeat()));
         widget.connect_seek(clone!(@weak model => move |position| model.seek_to(position)));
         widget.connect_now_playing_clicked(clone!(@weak model => move || model.go_home()));
+        widget.connect_volume_changed(
+            clone!(@weak model => move |volume| model.change_volume(volume)),
+        );
 
         Self {
             model,
@@ -124,6 +132,10 @@ impl PlaybackControl {
         }
     }
 
+    fn sync_volume(&self, volume: f64) {
+        self.widget.set_volume(volume);
+    }
+
     fn sync_seek(&self, pos: u32) {
         self.widget.set_seek_position(pos as f64);
     }
@@ -156,6 +168,9 @@ impl EventListener for PlaybackControl {
             AppEvent::SelectionEvent(SelectionEvent::SelectionModeChanged(active)) => {
                 self.widget.set_seekbar_visible(!active);
             }
+            AppEvent::PlaybackEvent(PlaybackEvent::VolumeSet(volume)) => {
+                self.sync_volume(*volume);
+            }
             _ => {}
         }
     }

src/app/components/playback/playback_controls.blp

@@ -54,4 +54,15 @@ template $PlaybackControlsWidget : Box {
     icon-name: "media-playlist-consecutive-symbolic";
     tooltip-text: _("Repeat");
   }
+
+  ScaleButton volume_slider {
+    halign: end;
+    tooltip-text: _("Volume");
+    adjustment: Adjustment {
+      step-increment: 0.01;
+      page-increment: 0.10;
+      upper: 1.0;
+      lower: 0.0;
+    };
+  }
 }

src/app/components/playback/playback_controls.rs

@@ -26,6 +26,9 @@ mod imp {
 
         #[template_child]
         pub repeat: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub volume_slider: TemplateChild<gtk::ScaleButton>,
     }
 
     #[glib::object_subclass]
@@ -43,7 +46,12 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for PlaybackControlsWidget {}
+    impl ObjectImpl for PlaybackControlsWidget {
+        fn constructed(&self) {
+            self.parent_constructed();
+            self.volume_slider.set_icons(&["audio-volume-high-symbolic"]);
+        }
+    }
     impl WidgetImpl for PlaybackControlsWidget {}
     impl BoxImpl for PlaybackControlsWidget {}
 }
@@ -86,6 +94,12 @@ impl PlaybackControlsWidget {
         self.imp().repeat.set_icon_name(repeat_mode_icon);
     }
 
+    pub fn set_volume(&self, volume: f64) {
+        imp::PlaybackControlsWidget::from_obj(self)
+            .volume_slider
+            .set_value(volume)
+    }
+
     pub fn connect_play_pause<F>(&self, f: F)
     where
         F: Fn() + 'static,
@@ -120,4 +134,15 @@ impl PlaybackControlsWidget {
     {
         self.imp().repeat.connect_clicked(move |_| f());
     }
+
+    pub fn connect_volume_changed<F>(&self, f: F)
+    where
+        F: Fn(f64) + 'static,
+    {
+        imp::PlaybackControlsWidget::from_obj(self)
+            .volume_slider
+            .connect_value_changed(move |_, value| {
+                f(value);
+            });
+    }
 }

src/app/components/playback/playback_widget.rs

@@ -97,7 +97,7 @@ impl PlaybackWidget {
         let weak_self = self.downgrade();
         worker.send_local_task(async move {
             let loader = ImageLoader::new();
-            let result = loader.load_remote(&url, "jpg", 48, 48).await;
+            let result = loader.load_remote(&url, "jpg", 64, 64).await;
             if let (Some(ref _self), Some(ref result)) = (weak_self.upgrade(), result) {
                 _self.set_artwork(result);
             }
@@ -136,6 +136,12 @@ impl PlaybackWidget {
         self.set_seek_position(value);
     }
 
+    pub fn set_volume(&self, volume: f64) {
+        let widget = imp::PlaybackWidget::from_instance(self);
+        widget.controls.set_volume(volume);
+        widget.controls_mobile.set_volume(volume);
+    }
+
     pub fn connect_now_playing_clicked<F>(&self, f: F)
     where
         F: Fn() + Clone + 'static,
@@ -239,4 +245,13 @@ impl PlaybackWidget {
         widget.controls.connect_repeat(f.clone());
         widget.controls_mobile.connect_repeat(f);
     }
+
+    pub fn connect_volume_changed<F>(&self, f: F)
+    where
+        F: Fn(f64) + Clone + 'static,
+    {
+        let widget = imp::PlaybackWidget::from_instance(self);
+        widget.controls.connect_volume_changed(f.clone());
+        widget.controls_mobile.connect_volume_changed(f);
+    }
 }

src/app/components/playback/volume_slider.blp

@@ -0,0 +1,11 @@
+template $VolumeButton: ScaleButton {
+    receives-default: true;
+    halign: end;
+    tooltip-text: _("Volume");
+    adjustment: Adjustment {
+      step-increment: 0.01;
+      page-increment: 0.10;
+      upper: 1.0;
+      lower: 0.0;
+    };
+}

src/connect/player.rs

@@ -114,8 +114,8 @@ impl ConnectPlayer {
         debug!("polling connect device...");
         let player_state = self.api.player_state().await;
         let Ok(state) = player_state else {
-                self.device_lost();
-                return;
+            self.device_lost();
+            return;
         };
         self.apply_remote_state(&state).await;
         if let Ok(mut last_state) = self.last_state.write() {
@@ -133,7 +133,8 @@ impl ConnectPlayer {
             source,
             offset,
             song,
-        } = command else {
+        } = command
+        else {
             panic!("Illegal call");
         };
         let is_diff_song = current_state

src/player/player.rs

@@ -66,12 +66,13 @@ pub enum AudioBackend {
     Alsa(String),
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct SpotifyPlayerSettings {
     pub bitrate: Bitrate,
     pub backend: AudioBackend,
     pub gapless: bool,
     pub ap_port: Option<u16>,
+    pub volume: f64,
 }
 
 impl Default for SpotifyPlayerSettings {
@@ -81,6 +82,7 @@ impl Default for SpotifyPlayerSettings {
             gapless: true,
             backend: AudioBackend::PulseAudio,
             ap_port: None,
+            volume: 0.6,
         }
     }
 }
@@ -107,9 +109,7 @@ impl SpotifyPlayer {
     async fn handle(&mut self, action: Command) -> Result<(), SpotifyError> {
         match action {
             Command::PlayerSetVolume(volume) => {
-                if let Some(mixer) = self.mixer.as_mut() {
-                    mixer.set_volume((VolumeCtrl::MAX_VOLUME as f64 * volume) as u16);
-                }
+                self.set_volume(volume);
                 Ok(())
             }
             Command::PlayerResume => {
@@ -220,6 +220,13 @@ impl SpotifyPlayer {
         }
     }
 
+    fn set_volume(&mut self, volume: f64) {
+        if let Some(mixer) = self.mixer.as_mut() {
+            mixer.set_volume((VolumeCtrl::MAX_VOLUME as f64 * volume) as u16);
+            self.settings.volume = volume;
+        }
+    }
+
     fn create_player(&mut self, session: Session) -> (Player, PlayerEventChannel) {
         let backend = self.settings.backend.clone();
 
@@ -233,17 +240,14 @@ impl SpotifyPlayer {
         let soft_volume = self
             .mixer
             .get_or_insert_with(|| {
-                let mix = Box::new(SoftMixer::open(MixerConfig {
+                Box::new(SoftMixer::open(MixerConfig {
                     // This value feels reasonable to me. Feel free to change it
                     volume_ctrl: VolumeCtrl::Log(VolumeCtrl::DEFAULT_DB_RANGE / 2.0),
                     ..Default::default()
-                }));
-                // TODO: Should read volume from somewhere instead of hard coding.
-                // Sets volume to 100%
-                mix.set_volume(VolumeCtrl::MAX_VOLUME);
-                mix
+                }))
             })
             .get_soft_volume();
+        self.set_volume(self.settings.volume);
         Player::new(player_config, session, soft_volume, move || match backend {
             AudioBackend::GStreamer(pipeline) => {
                 let backend = audio_backend::find(Some("gstreamer".to_string())).unwrap();

src/settings.rs

@@ -70,11 +70,14 @@ impl SpotifyPlayerSettings {
             x => Some(x as u16),
         };
 
+        let volume = settings.double("volume").clamp(0.0, 1.0);
+
         Some(Self {
             bitrate,
             backend,
             gapless,
             ap_port,
+            volume
         })
     }
 }