From d9782a7390d41ade5902c5db817d209979f5e206 Mon Sep 17 00:00:00 2001 From: chmanie Date: Thu, 8 Jun 2023 14:57:17 +0200 Subject: [PATCH] Clamp volume in engine --- audio-player/src/player.rs | 3 +-- audio-player/src/player_engine.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/audio-player/src/player.rs b/audio-player/src/player.rs index 562f496..5456235 100644 --- a/audio-player/src/player.rs +++ b/audio-player/src/player.rs @@ -134,9 +134,8 @@ impl Player { pub async fn set_volume(&self, volume: f32) -> Result { let (tx, rx) = flume::bounded(1); - let vol = volume.clamp(0.0, 1.1); self.tx_engine - .send(PlayerEngineCommand::SetVolume(vol, tx))?; + .send(PlayerEngineCommand::SetVolume(volume, tx))?; rx.recv_async().await? } diff --git a/audio-player/src/player_engine.rs b/audio-player/src/player_engine.rs index b68b0c6..bee2e40 100644 --- a/audio-player/src/player_engine.rs +++ b/audio-player/src/player_engine.rs @@ -210,7 +210,7 @@ impl PlayerEngine { pub fn set_volume(&mut self, volume: f32) -> Result { if let Some(sink) = &self.sink { - sink.set_volume(volume); + sink.set_volume(volume.clamp(0.0, 1.1)); return Ok(sink.volume()); } Err(PlayerEngineError::NotPlaying.into())