projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
give 'str' variables more appropriate names
[nihav.git]
/
nihav-game
/
src
/
demuxers
/
imax.rs
diff --git
a/nihav-game/src/demuxers/imax.rs
b/nihav-game/src/demuxers/imax.rs
index 2cd9f70c3807a7975890aff93de03e17c27cd2cc..999ea1ae9d49292c7385775ce0a3d5793b97c9e7 100644
(file)
--- a/
nihav-game/src/demuxers/imax.rs
+++ b/
nihav-game/src/demuxers/imax.rs
@@
-48,10
+48,10
@@
impl<'a> DemuxCore<'a> for IMAXDemuxer<'a> {
match ftype {
0xAA97 => {
match ftype {
0xAA97 => {
- let str = strmgr.get_stream(self.v_id).unwrap();
- let ts = str.make_ts(Some(self.cur_frame), None, None);
+ let str
eam
= strmgr.get_stream(self.v_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.cur_frame), None, None);
self.cur_frame += 1;
self.cur_frame += 1;
- let mut pkt = self.src.read_packet(str, ts, true, fsize)?;
+ let mut pkt = self.src.read_packet(str
eam
, ts, true, fsize)?;
pkt.add_side_data(NASideData::Palette(self.pal_change, self.pal.clone()));
self.pal_change = false;
return Ok(pkt);
pkt.add_side_data(NASideData::Palette(self.pal_change, self.pal.clone()));
self.pal_change = false;
return Ok(pkt);
@@
-71,10
+71,10
@@
impl<'a> DemuxCore<'a> for IMAXDemuxer<'a> {
self.pal_change = true;
},
0xAA99 => {
self.pal_change = true;
},
0xAA99 => {
- let str = strmgr.get_stream(self.a_id).unwrap();
- let ts = str.make_ts(Some(self.apos), None, None);
+ let str
eam
= strmgr.get_stream(self.a_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.apos), None, None);
self.apos += fsize as u64;
self.apos += fsize as u64;
- return self.src.read_packet(str, ts, true, fsize);
+ return self.src.read_packet(str
eam
, ts, true, fsize);
},
0xAAFF => return Err(DemuxerError::EOF),
_ => return Err(DemuxerError::InvalidData),
},
0xAAFF => return Err(DemuxerError::EOF),
_ => return Err(DemuxerError::InvalidData),