diff options
Diffstat (limited to 'mumd')
| -rw-r--r-- | mumd/src/audio/output.rs | 7 | ||||
| -rw-r--r-- | mumd/src/state.rs | 16 |
2 files changed, 17 insertions, 6 deletions
diff --git a/mumd/src/audio/output.rs b/mumd/src/audio/output.rs index 450bcc8..ce116a8 100644 --- a/mumd/src/audio/output.rs +++ b/mumd/src/audio/output.rs @@ -85,7 +85,12 @@ pub fn curry_callback<T: Sample + AddAssign + SaturatingAdd>( let mut lock = buf.lock().unwrap(); for (id, client_stream) in &mut *lock { - let (user_volume, muted) = user_volumes.lock().unwrap().get(id).cloned().unwrap_or((1.0, false)); + let (user_volume, muted) = user_volumes + .lock() + .unwrap() + .get(id) + .cloned() + .unwrap_or((1.0, false)); for sample in data.iter_mut() { let s = client_stream.buffer.pop_front().unwrap_or(0.0) * volume * user_volume; if !muted { diff --git a/mumd/src/state.rs b/mumd/src/state.rs index f04e6f1..5781df3 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -71,7 +71,8 @@ impl State { let config = mumlib::config::read_default_cfg(); let audio = Audio::new( config.audio.input_volume.unwrap_or(1.0), - config.audio.output_volume.unwrap_or(1.0)); + config.audio.output_volume.unwrap_or(1.0), + ); let mut state = Self { config, server: None, @@ -245,7 +246,7 @@ impl State { None } } - None => Some(!self.server().unwrap().deafened()) + None => Some(!self.server().unwrap().deafened()), }; if let Some(action) = action { @@ -273,7 +274,7 @@ impl State { None } } - None => Some(!self.server().unwrap().muted()) + None => Some(!self.server().unwrap().muted()), }; if let Some(action) = action { @@ -293,7 +294,12 @@ impl State { return now!(Err(Error::DisconnectedError)); } - let id = self.server_mut().unwrap().users_mut().iter_mut().find(|(_, user)| user.name() == &string); + let id = self + .server_mut() + .unwrap() + .users_mut() + .iter_mut() + .find(|(_, user)| user.name() == &string); let (id, user) = match id { Some(id) => (*id.0, id.1), @@ -308,7 +314,7 @@ impl State { None } } - None => Some(!user.suppressed()) + None => Some(!user.suppressed()), }; debug!("{:?}", action); |