diff options
| -rw-r--r-- | mumd/src/audio/sound_effects.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mumd/src/audio/sound_effects.rs b/mumd/src/audio/sound_effects.rs index aac9852..21a514b 100644 --- a/mumd/src/audio/sound_effects.rs +++ b/mumd/src/audio/sound_effects.rs @@ -90,13 +90,17 @@ pub fn load_sound_effects(overrides: &[SoundEffect], num_channels: usize) -> Has // effect (if omitted). We then use dasp to convert to the correct sample rate. NotificationEvents::iter() .map(|event| { - // Open the file if overriden, otherwise use the default sound effect. let file = overrides.get(&event); + // Try to open the file if overriden, otherwise use the default sound effect. let (data, kind) = file - .map(|file| ( - get_sfx(file), - AudioFileKind::Wav - )) + .and_then(|file| { + // Try to get the file kind from the extension. + let kind = file + .split('.') + .last() + .and_then(|ext| AudioFileKind::try_from(ext).ok())?; + Some((get_sfx(file), kind)) + }) .unwrap_or_else(|| (get_default_sfx(), AudioFileKind::Wav)); // Unpack the samples. let (samples, spec) = unpack_audio(data, kind); |