switch demuxers to use NAStream::make_ts()

[nihav.git] / nihav-llaudio / src / demuxers / ape.rs

diff --git a/nihav-llaudio/src/demuxers/ape.rs b/nihav-llaudio/src/demuxers/ape.rs
index bae9416ba2ab3f8ebd082aa48cef97fc28b96795..76717378ff201c2aaa878140b536b67a60b0d6e0 100644 (file)
--- a/nihav-llaudio/src/demuxers/ape.rs
+++ b/nihav-llaudio/src/demuxers/ape.rs
@@ -39,7 +39,7 @@ impl<'a> DemuxCore<'a> for APEDemuxer<'a> {
         let tag                         = src.read_tag()?;
         validate!(&tag == b"MAC ");
         let version                     = src.read_u16le()?;
-        validate!(version >= 3800 && version <= 3990);
+        validate!((3800..=3990).contains(&version));
 
         let seektab_len;
         let _wavtail_len;
@@ -205,8 +205,7 @@ impl<'a> DemuxCore<'a> for APEDemuxer<'a> {
                                           self.src.read_buf(&mut buf[8..])?;
 
         let stream = strmgr.get_stream(0).unwrap();
-        let (tb_num, tb_den) = stream.get_timebase();
-        let ts = NATimeInfo::new(Some(self.cur_frame as u64), None, None, tb_num, tb_den);
+        let ts = stream.make_ts(Some(self.cur_frame as u64), None, None);
         let pkt = NAPacket::new(stream, ts, true, buf);
 
         self.cur_frame += 1;
@@ -251,6 +250,7 @@ mod test {
 
     #[test]
     fn test_ape_demux() {
+        // sample: https://samples.mplayerhq.hu/A-codecs/lossless/luckynight.ape
         let mut file = File::open("assets/LLaudio/ape/luckynight.ape").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);