diff options
| -rw-r--r-- | mumd/src/audio.rs | 84 | ||||
| -rw-r--r-- | mumd/src/state.rs | 5 | ||||
| -rw-r--r-- | mumlib/src/config.rs | 7 |
3 files changed, 53 insertions, 43 deletions
diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 0820147..f1c3ec9 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -9,39 +9,25 @@ use dasp_interpolate::linear::Linear; use dasp_signal::{self as signal, Signal}; use log::*; use mumble_protocol::voice::VoicePacketPayload; +use mumlib::config::SoundEffect; use opus::Channels; -use std::collections::hash_map::Entry; +use std::{collections::hash_map::Entry, fs::File}; use std::collections::{HashMap, VecDeque}; use std::sync::{Arc, Mutex}; use tokio::sync::{mpsc, watch}; //TODO? move to mumlib -pub const EVENT_SOUNDS: &[(&[u8], NotificationEvents)] = &[ - (include_bytes!("resources/connect.wav"), NotificationEvents::ServerConnect), - ( - include_bytes!("resources/disconnect.wav"), - NotificationEvents::ServerDisconnect, - ), - ( - include_bytes!("resources/channel_join.wav"), - NotificationEvents::UserConnected, - ), - ( - include_bytes!("resources/channel_leave.wav"), - NotificationEvents::UserDisconnected, - ), - ( - include_bytes!("resources/channel_join.wav"), - NotificationEvents::UserJoinedChannel, - ), - ( - include_bytes!("resources/channel_leave.wav"), - NotificationEvents::UserLeftChannel, - ), - (include_bytes!("resources/mute.wav"), NotificationEvents::Mute), - (include_bytes!("resources/unmute.wav"), NotificationEvents::Unmute), - (include_bytes!("resources/deafen.wav"), NotificationEvents::Deafen), - (include_bytes!("resources/undeafen.wav"), NotificationEvents::Undeafen), +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"), ]; const SAMPLE_RATE: u32 = 48000; @@ -216,10 +202,27 @@ impl Audio { output_stream.play().unwrap(); - let sounds = EVENT_SOUNDS + let mut res = Self { + output_config, + _output_stream: output_stream, + _input_stream: input_stream, + input_volume_sender, + input_channel_receiver: Some(input_receiver), + client_streams, + sounds: HashMap::new(), + output_volume_sender, + user_volumes, + play_sounds, + }; + res.load_sound_effects(&vec![]); + res + } + + pub fn load_sound_effects(&mut self, _sound_effects: &Vec<SoundEffect>) -> Result<(), ()> { + self.sounds = DEFAULT_SOUND_FILES .iter() - .map(|(bytes, event)| { - let reader = hound::WavReader::new(*bytes).unwrap(); + .map(|(event, file)| { + let reader = hound::WavReader::new(File::open(file).unwrap()).unwrap(); let spec = reader.spec(); let samples = match spec.sample_format { hound::SampleFormat::Float => reader @@ -242,24 +245,19 @@ impl Audio { .from_hz_to_hz(interp, spec.sample_rate as f64, SAMPLE_RATE as f64) .until_exhausted() // if the source audio is stereo and is being played as mono, discard the right audio - .flat_map(|e| if output_config.channels == 1 { vec![e[0]] } else { e.to_vec() }) + .flat_map( + |e| if self.output_config.channels == 1 { + vec![e[0]] + } else { + e.to_vec() + } + ) .collect::<Vec<f32>>(); (*event, samples) }) .collect(); - Self { - output_config, - _output_stream: output_stream, - _input_stream: input_stream, - input_volume_sender, - input_channel_receiver: Some(input_receiver), - client_streams, - sounds, - output_volume_sender, - user_volumes, - play_sounds, - } + Ok(()) } pub fn decode_packet(&self, session_id: u32, payload: VoicePacketPayload) { diff --git a/mumd/src/state.rs b/mumd/src/state.rs index d1f64a9..47aef66 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -573,6 +573,11 @@ impl State { if let Some(output_volume) = self.config.audio.output_volume { self.audio.set_output_volume(output_volume); } + if let Some(sound_effects) = &self.config.audio.sound_effects { + if let Err(e) = self.audio.load_sound_effects(sound_effects) { + warn!("Error loading sound effects: {:?}", e); + } + } } pub fn initialized(&self) { diff --git a/mumlib/src/config.rs b/mumlib/src/config.rs index 5987ab9..0a43253 100644 --- a/mumlib/src/config.rs +++ b/mumlib/src/config.rs @@ -47,9 +47,16 @@ impl Config { } #[derive(Clone, Debug, Default, Deserialize, Serialize)] +pub struct SoundEffect { + pub event: String, + pub file: String, +} + +#[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct AudioConfig { pub input_volume: Option<f32>, pub output_volume: Option<f32>, + pub sound_effects: Option<Vec<SoundEffect>>, } #[derive(Clone, Debug, Deserialize, Serialize)] |