From 3fdaf1a59687d9f4e47810826e4ea9d527a0c689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Sun, 3 Jan 2021 12:58:23 +0100
Subject: override sound effects

---
 mumd/src/audio.rs | 61 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 14 deletions(-)

(limited to 'mumd/src')

diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs
index f1c3ec9..67c3e59 100644
--- a/mumd/src/audio.rs
+++ b/mumd/src/audio.rs
@@ -11,23 +11,23 @@ use log::*;
 use mumble_protocol::voice::VoicePacketPayload;
 use mumlib::config::SoundEffect;
 use opus::Channels;
-use std::{collections::hash_map::Entry, fs::File};
+use std::{collections::hash_map::Entry, fs::File, io};
 use std::collections::{HashMap, VecDeque};
 use std::sync::{Arc, Mutex};
 use tokio::sync::{mpsc, watch};
 
 //TODO? move to mumlib
 pub const DEFAULT_SOUND_FILES: &[(NotificationEvents, &str)] = &[
-    (NotificationEvents::ServerConnect, "resources/connect.wav"),
-    (NotificationEvents::ServerDisconnect, "resources/disconnect.wav"),
-    (NotificationEvents::UserConnected, "resources/channel_join.wav"),
-    (NotificationEvents::UserDisconnected, "resources/channel_leave.wav"),
-    (NotificationEvents::UserJoinedChannel, "resources/channel_join.wav"),
-    (NotificationEvents::UserLeftChannel, "resources/channel_leave.wav"),
-    (NotificationEvents::Mute, "resources/mute.wav"),
-    (NotificationEvents::Unmute, "resources/unmute.wav"),
-    (NotificationEvents::Deafen, "resources/deafen.wav"),
-    (NotificationEvents::Undeafen, "resources/undeafen.wav"),
+    (NotificationEvents::ServerConnect, "connect.wav"),
+    (NotificationEvents::ServerDisconnect, "disconnect.wav"),
+    (NotificationEvents::UserConnected, "channel_join.wav"),
+    (NotificationEvents::UserDisconnected, "channel_leave.wav"),
+    (NotificationEvents::UserJoinedChannel, "channel_join.wav"),
+    (NotificationEvents::UserLeftChannel, "channel_leave.wav"),
+    (NotificationEvents::Mute, "mute.wav"),
+    (NotificationEvents::Unmute, "unmute.wav"),
+    (NotificationEvents::Deafen, "deafen.wav"),
+    (NotificationEvents::Undeafen, "undeafen.wav"),
 ];
 
 const SAMPLE_RATE: u32 = 48000;
@@ -214,15 +214,44 @@ impl Audio {
             user_volumes,
             play_sounds,
         };
-        res.load_sound_effects(&vec![]);
+        res.load_sound_effects(&vec![]).unwrap();
         res
     }
 
-    pub fn load_sound_effects(&mut self, _sound_effects: &Vec<SoundEffect>) -> Result<(), ()> {
+    pub fn load_sound_effects(&mut self, sound_effects: &Vec<SoundEffect>) -> Result<(), ()> {
+        let overrides: HashMap<_, _> = sound_effects
+            .iter()
+            .map(|sound_effect| { (&sound_effect.event, &sound_effect.file) })
+            .filter_map(|(event, file)| {
+                let event = match event.as_str() {
+                    "server_connect" => NotificationEvents::ServerConnect,
+                    "server_disconnect" => NotificationEvents::ServerDisconnect,
+                    "user_connected" => NotificationEvents::UserConnected,
+                    "user_disconnected" => NotificationEvents::UserDisconnected,
+                    "user_joined_channel" => NotificationEvents::UserJoinedChannel,
+                    "user_left_channel" => NotificationEvents::UserLeftChannel,
+                    "mute" => NotificationEvents::Mute,
+                    "unmute" => NotificationEvents::Unmute,
+                    "deafen" => NotificationEvents::Deafen,
+                    "undeafen" => NotificationEvents::Undeafen,
+                    _ => {
+                        warn!("Unknown notification event '{}' in config", event);
+                        return None;
+                    }
+                };
+                Some((event, file))
+            })
+            .collect();
+
         self.sounds = DEFAULT_SOUND_FILES
             .iter()
             .map(|(event, file)| {
-                let reader = hound::WavReader::new(File::open(file).unwrap()).unwrap();
+                let file = if let Some(file) = overrides.get(event) {
+                    *file
+                } else {
+                    *file
+                };
+                let reader = hound::WavReader::new(get_resource(file).unwrap()).unwrap();
                 let spec = reader.spec();
                 let samples = match spec.sample_format {
                     hound::SampleFormat::Float => reader
@@ -352,3 +381,7 @@ impl Audio {
         play_sounds.extend(samples.iter().skip(l));
     }
 }
+
+fn get_resource(file: &str) -> io::Result<File> {
+    File::open(file)
+}
-- 
cgit v1.2.1