X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fimax.rs;fp=nihav-game%2Fsrc%2Fdemuxers%2Fimax.rs;h=999ea1ae9d49292c7385775ce0a3d5793b97c9e7;hp=2cd9f70c3807a7975890aff93de03e17c27cd2cc;hb=817e487223b28379176a533f09485c27a68443f8;hpb=8e14efb001fac3fecb0cb56df8705d23fa2231a8 diff --git a/nihav-game/src/demuxers/imax.rs b/nihav-game/src/demuxers/imax.rs index 2cd9f70..999ea1a 100644 --- 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 => { - let str = strmgr.get_stream(self.v_id).unwrap(); - let ts = str.make_ts(Some(self.cur_frame), None, None); + let stream = strmgr.get_stream(self.v_id).unwrap(); + let ts = stream.make_ts(Some(self.cur_frame), None, None); self.cur_frame += 1; - let mut pkt = self.src.read_packet(str, ts, true, fsize)?; + let mut pkt = self.src.read_packet(stream, ts, true, fsize)?; 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 => { - let str = strmgr.get_stream(self.a_id).unwrap(); - let ts = str.make_ts(Some(self.apos), None, None); + let stream = strmgr.get_stream(self.a_id).unwrap(); + let ts = stream.make_ts(Some(self.apos), None, None); self.apos += fsize as u64; - return self.src.read_packet(str, ts, true, fsize); + return self.src.read_packet(stream, ts, true, fsize); }, 0xAAFF => return Err(DemuxerError::EOF), _ => return Err(DemuxerError::InvalidData),