aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/audio/sound_effects.rs
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2021-06-19 17:06:44 +0200
committerGustav Sörnäs <gustav@sornas.net>2021-06-19 17:06:44 +0200
commita3be71e2f6b21ae4c8bac8b7ffd1d3f147357339 (patch)
treeadc2646c2ee37bbabfae3ba5022f10e3bdf9b446 /mumd/src/audio/sound_effects.rs
parent402d51d25b8336c85154fa912e7dd1739fdfc55f (diff)
downloadmum-a3be71e2f6b21ae4c8bac8b7ffd1d3f147357339.tar.gz
add lifetimes to cows
Diffstat (limited to 'mumd/src/audio/sound_effects.rs')
-rw-r--r--mumd/src/audio/sound_effects.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/mumd/src/audio/sound_effects.rs b/mumd/src/audio/sound_effects.rs
index b6f41f1..205b3f7 100644
--- a/mumd/src/audio/sound_effects.rs
+++ b/mumd/src/audio/sound_effects.rs
@@ -145,7 +145,7 @@ pub fn load_sound_effects(overrides: &[SoundEffect], num_channels: usize) -> Has
}
/// Unpack audio data. The required audio spec is read from the file and returned as well.
-fn unpack_audio(data: Cow<[u8]>, kind: AudioFileKind) -> (Vec<f32>, AudioSpec) {
+fn unpack_audio(data: Cow<'_, [u8]>, kind: AudioFileKind) -> (Vec<f32>, AudioSpec) {
match kind {
AudioFileKind::Ogg => unpack_ogg(data),
AudioFileKind::Wav => unpack_wav(data),
@@ -154,7 +154,7 @@ fn unpack_audio(data: Cow<[u8]>, kind: AudioFileKind) -> (Vec<f32>, AudioSpec) {
#[cfg(feature = "ogg")]
/// Unpack ogg data.
-fn unpack_ogg(data: Cow<[u8]>) -> (Vec<f32>, AudioSpec) {
+fn unpack_ogg(data: Cow<'_, [u8]>) -> (Vec<f32>, AudioSpec) {
let mut reader = lewton::inside_ogg::OggStreamReader::new(Cursor::new(data.as_ref())).unwrap();
let mut samples = Vec::new();
while let Ok(Some(mut frame)) = reader.read_dec_packet_itl() {
@@ -170,13 +170,13 @@ fn unpack_ogg(data: Cow<[u8]>) -> (Vec<f32>, AudioSpec) {
#[cfg(not(feature = "ogg"))]
/// Fallback to default sound effect since ogg is disabled.
-fn unpack_ogg(_: Cow<[u8]>) -> (Vec<f32>, AudioSpec) {
+fn unpack_ogg(_: Cow<'_, [u8]>) -> (Vec<f32>, AudioSpec) {
warn!("Can't open .ogg without the ogg-feature enabled.");
unpack_wav(get_default_sfx())
}
/// Unpack wav data.
-fn unpack_wav(data: Cow<[u8]>) -> (Vec<f32>, AudioSpec) {
+fn unpack_wav(data: Cow<'_, [u8]>) -> (Vec<f32>, AudioSpec) {
let reader = hound::WavReader::new(data.as_ref()).unwrap();
let spec = reader.spec();
let samples = match spec.sample_format {