jamie/bwavfile
1
0
Fork 0
mirror of https://github.com/iluvcapra/bwavfile.git synced 2025-12-31 17:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update wavereader.rs

Browse Source
This commit is contained in:
Jamie Hardt
2020-12-13 12:30:43 -08:00
parent 4cb6105073
commit f4b27f8545
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/wavereader.rs
View File

@@ -12,7 +12,7 @@ use super::chunks::ReadBWaveChunks;
use super::cue::Cue; use super::cue::Cue;
use std::io::Cursor; use std::io::Cursor;
use std::io::{Read, Seek}; use std::io::{Read, Seek, SeekFrom};
/** /**
@@ -385,10 +385,10 @@ impl<R:Read+Seek> WaveReader<R> {
// As time passes thi get smore obnoxious because I haven't implemented recursive chunk // As time passes thi get smore obnoxious because I haven't implemented recursive chunk
// parsing in the raw parser and I'm working around it // parsing in the raw parser and I'm working around it
fn chunk_reader(&mut self, signature: FourCC, at_index: u32) -> Result<RawChunkReader<R>, ParserError> { // fn chunk_reader(&mut self, signature: FourCC, at_index: u32) -> Result<RawChunkReader<R>, ParserError> {
let (start, length) = self.get_chunk_extent_at_index(signature, at_index)?; // let (start, length) = self.get_chunk_extent_at_index(signature, at_index)?;
Ok( RawChunkReader::new(&mut self.inner, start, length) ) // Ok( RawChunkReader::new(&mut self.inner, start, length) )
} // }
fn read_list(&mut self, ident: FourCC, buffer: &mut Vec<u8>) -> Result<usize, ParserError> { fn read_list(&mut self, ident: FourCC, buffer: &mut Vec<u8>) -> Result<usize, ParserError> {
if let Some(index) = self.get_list_form(ident)? { if let Some(index) = self.get_list_form(ident)? {
@@ -399,18 +399,11 @@ impl<R:Read+Seek> WaveReader<R> {
} }
fn read_chunk(&mut self, ident: FourCC, at: u32, buffer: &mut Vec<u8>) -> Result<usize, ParserError> { fn read_chunk(&mut self, ident: FourCC, at: u32, buffer: &mut Vec<u8>) -> Result<usize, ParserError> {
let result = self.chunk_reader(ident, at); let (start, length) = self.get_chunk_extent_at_index(ident, at)?;
match result { self.inner.seek(SeekFrom::Start(start));
Ok(mut chunk) => {
match chunk.read_to_end(buffer) { Ok( self.inner.read_to_end(buffer)? )
Ok(read) => Ok(read),
Err(err) => Err(err.into())
}
},
Err(ParserError::ChunkMissing { signature : _} ) => Ok(0),
Err( any ) => Err(any.into())
}
} }
/// Extent of every chunk with the given fourcc /// Extent of every chunk with the given fourcc