Renamed axml method

This commit is contained in:
Jamie Hardt
2020-11-28 11:01:50 -08:00
parent 9cbb2664d4
commit 69da33b3dc

View File

@@ -103,7 +103,7 @@ impl<R: Read + Seek> WaveReader<R> {
/**
* Create an `AudioFrameReader` for reading each audio frame.
*/
pub fn audio_frame_reader(&mut self) -> Result<AudioFrameReader<RawChunkReader<R>>, ParserError> {
pub fn audio_frame_reader(&mut self) -> Result<AudioFrameReader<impl RRead>>, ParserError> {
let format = self.format()?;
let audio_chunk_reader = self.chunk_reader(DATA_SIG, 0)?;
Ok(AudioFrameReader::new(audio_chunk_reader, format))
@@ -177,11 +177,13 @@ impl<R: Read + Seek> WaveReader<R> {
}
}
/// Read ADM XML data.
/// Read AXML data.
///
/// By convention this will generally be ADM metadata.
///
/// If there are no iXML metadata present in the file,
/// Err(Error::ChunkMissing { "axml" } will be returned.
pub fn adm_xml(&mut self, buffer: &mut Vec<u8>) -> Result<usize, ParserError> {
pub fn axml(&mut self, buffer: &mut Vec<u8>) -> Result<usize, ParserError> {
let axml_sig: FourCC = FourCC::make(b"axml");
let mut chunk = self.chunk_reader(axml_sig, 0)?;
@@ -191,6 +193,8 @@ impl<R: Read + Seek> WaveReader<R> {
}
}
/**
* Validate file is readable.
*