From 4628b54e8c938238eee8ca44502f571ea0413d98 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Mon, 17 Feb 2025 10:57:00 +0100 Subject: [PATCH] chore: other small fixes --- src/model/playlist.rs | 2 +- src/mpris.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/model/playlist.rs b/src/model/playlist.rs index 5447963d7..63cb4bf62 100644 --- a/src/model/playlist.rs +++ b/src/model/playlist.rs @@ -48,7 +48,7 @@ impl Playlist { } pub fn has_track(&self, track_id: &str) -> bool { - self.tracks.as_ref().map_or(false, |tracks| { + self.tracks.as_ref().is_some_and(|tracks| { tracks .iter() .any(|track| track.id() == Some(track_id.to_string())) diff --git a/src/mpris.rs b/src/mpris.rs index ef0893105..6829cff34 100644 --- a/src/mpris.rs +++ b/src/mpris.rs @@ -274,10 +274,10 @@ impl MprisPlayer { } #[zbus(property)] - fn set_volume(&self, mut volume: f64) { + fn set_volume(&self, volume: f64) { log::info!("set volume: {volume}"); - volume = volume.clamp(0.0, 1.0); - let vol = (VOLUME_PERCENT as f64) * volume * 100.0; + let clamped = volume.clamp(0.0, 1.0); + let vol = (VOLUME_PERCENT as f64) * clamped * 100.0; self.spotify.set_volume(vol as u16, false); self.event.trigger(); }