From 1bf223de5aca7d39347efa468558e14c02fe8d6a Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Mon, 16 Nov 2020 02:13:25 +0100
Subject: add sound for muting and unmuting self

---
 mumd/src/state.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'mumd/src/state.rs')

diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 69bf4df..d719851 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -238,7 +238,7 @@ impl State {
                     return now!(Err(Error::DisconnectedError));
                 }
 
-                let server = self.server_mut().unwrap();
+                let server = self.server().unwrap();
                 let action = match (toggle, server.muted(), server.deafened()) {
                     (Some(false), false, false) => None,
                     (Some(false), false, true) => Some((false, false)),
@@ -258,12 +258,15 @@ impl State {
                     let mut msg = msgs::UserState::new();
                     if server.muted() != mute {
                         msg.set_self_mute(mute);
+                        self.audio.play_effect(if mute { NotificationEvents::Mute } else { NotificationEvents::Unmute });
                     } else if !mute && !deafen && server.deafened() {
                         msg.set_self_mute(false);
                     }
                     if server.deafened() != deafen {
                         msg.set_self_deaf(deafen);
+                        self.audio.play_effect(if deafen { NotificationEvents::Deafen } else { NotificationEvents::Undeafen });
                     }
+                    let server = self.server_mut().unwrap();
                     server.set_muted(mute);
                     server.set_deafened(deafen);
                     self.packet_sender.send(msg.into()).unwrap();
@@ -276,7 +279,7 @@ impl State {
                     return now!(Err(Error::DisconnectedError));
                 }
 
-                let server = self.server_mut().unwrap();
+                let server = self.server().unwrap();
                 let action = match (toggle, server.muted(), server.deafened()) {
                     (Some(false), false, false) => None,
                     (Some(false), false, true) => Some((false, false)),
@@ -296,12 +299,15 @@ impl State {
                     let mut msg = msgs::UserState::new();
                     if server.muted() != mute {
                         msg.set_self_mute(mute);
+                        self.audio.play_effect(if mute { NotificationEvents::Mute } else { NotificationEvents::Unmute });
                     } else if !mute && !deafen && server.deafened() {
                         msg.set_self_mute(false);
                     }
                     if server.deafened() != deafen {
                         msg.set_self_deaf(deafen);
+                        self.audio.play_effect(if deafen { NotificationEvents::Deafen } else { NotificationEvents::Undeafen });
                     }
+                    let server = self.server_mut().unwrap();
                     server.set_muted(mute);
                     server.set_deafened(deafen);
                     self.packet_sender.send(msg.into()).unwrap();
-- 
cgit v1.2.1