mirror of
https://github.com/lightsoutgames/bevy_openal.git
synced 2024-11-23 09:45:56 +00:00
Add MP3 support.
This commit is contained in:
parent
6e8cc4c5ea
commit
b85fbe3257
|
@ -13,4 +13,5 @@ anyhow = "1"
|
||||||
bevy = { version = "0.5", default-features = false }
|
bevy = { version = "0.5", default-features = false }
|
||||||
claxon = "0.4"
|
claxon = "0.4"
|
||||||
hound = "3"
|
hound = "3"
|
||||||
lewton = "0.10"
|
lewton = "0.10"
|
||||||
|
minimp3 = "0.5"
|
33
src/lib.rs
33
src/lib.rs
|
@ -19,6 +19,7 @@ use bevy::{
|
||||||
utils::BoxedFuture,
|
utils::BoxedFuture,
|
||||||
};
|
};
|
||||||
use lewton::inside_ogg::OggStreamReader;
|
use lewton::inside_ogg::OggStreamReader;
|
||||||
|
use minimp3::{Decoder, Error};
|
||||||
|
|
||||||
#[derive(Clone, Debug, TypeUuid)]
|
#[derive(Clone, Debug, TypeUuid)]
|
||||||
#[uuid = "aa22d11e-3bed-11eb-8708-00155dea3db9"]
|
#[uuid = "aa22d11e-3bed-11eb-8708-00155dea3db9"]
|
||||||
|
@ -70,6 +71,36 @@ impl AssetLoader for BufferAssetLoader {
|
||||||
sample_rate: stream.ident_hdr.audio_sample_rate as i32,
|
sample_rate: stream.ident_hdr.audio_sample_rate as i32,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
"mp3" => {
|
||||||
|
let mut decoder = Decoder::new(cursor);
|
||||||
|
let mut samples: Vec<i16> = vec![];
|
||||||
|
let mut channels = 0_u16;
|
||||||
|
let mut sample_rate = 0;
|
||||||
|
let mut succeeded = true;
|
||||||
|
loop {
|
||||||
|
match decoder.next_frame() {
|
||||||
|
Ok(mut frame) => {
|
||||||
|
samples.append(&mut frame.data);
|
||||||
|
channels = frame.channels as u16;
|
||||||
|
sample_rate = frame.sample_rate;
|
||||||
|
}
|
||||||
|
Err(Error::Eof) => break,
|
||||||
|
Err(_) => {
|
||||||
|
succeeded = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if succeeded {
|
||||||
|
Some(Buffer {
|
||||||
|
samples,
|
||||||
|
channels,
|
||||||
|
sample_rate,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
"wav" => {
|
"wav" => {
|
||||||
let reader = hound::WavReader::new(cursor);
|
let reader = hound::WavReader::new(cursor);
|
||||||
if let Ok(mut reader) = reader {
|
if let Ok(mut reader) = reader {
|
||||||
|
@ -96,7 +127,7 @@ impl AssetLoader for BufferAssetLoader {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn extensions(&self) -> &[&str] {
|
fn extensions(&self) -> &[&str] {
|
||||||
&["flac", "ogg", "wav"]
|
&["flac", "ogg", "mp3", "wav"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user