X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Fdemuxers%2Fmod.rs;h=902fbba4db578fd74bc05e3e2a32fed22fb41012;hb=e243ceb4d694cc08767ad70027bb6963f4cefea3;hp=b3546fe49214a78df51611d826253de72f329055;hpb=70910ac3fdc02c7b7727a4a294f55134e9f5141d;p=nihav.git

diff --git a/nihav-core/src/demuxers/mod.rs b/nihav-core/src/demuxers/mod.rs
index b3546fe..902fbba 100644
--- a/nihav-core/src/demuxers/mod.rs
+++ b/nihav-core/src/demuxers/mod.rs
@@ -31,20 +31,19 @@ impl<'a> NAPacketReader for ByteReader<'a> {
         let mut buf: Vec<u8> = Vec::with_capacity(size);
         if buf.capacity() < size { return Err(DemuxerError::MemoryError); }
         buf.resize(size, 0);
-        let res = self.read_buf(buf.as_mut_slice());
-        if let Err(_) = res { return Err(DemuxerError::IOError); }
+        self.read_buf(buf.as_mut_slice())?;
         let pkt = NAPacket::new(str, ts, kf, buf);
         Ok(pkt)
     }
     fn fill_packet(&mut self, pkt: &mut NAPacket) -> DemuxerResult<()> {
         let mut refbuf = pkt.get_buffer();
         let buf = refbuf.as_mut().unwrap();
-        let res = self.read_buf(buf.as_mut_slice());
-        if let Err(_) = res { return Err(DemuxerError::IOError); }
+        self.read_buf(buf.as_mut_slice())?;
         Ok(())
     }
 }
 
+#[derive(Default)]
 pub struct StreamManager {
     streams: Vec<NAStreamRef>,
     ignored: Vec<bool>,
@@ -116,13 +115,13 @@ impl StreamManager {
 }
 
 pub struct StreamIter<'a> {
-    streams:    &'a Vec<NAStreamRef>,
+    streams:    &'a [NAStreamRef],
     pos:        usize,
 }
 
 impl<'a> StreamIter<'a> {
-    pub fn new(streams: &'a Vec<NAStreamRef>) -> Self {
-        StreamIter { streams: streams, pos: 0 }
+    pub fn new(streams: &'a [NAStreamRef]) -> Self {
+        StreamIter { streams, pos: 0 }
     }
 }
 
@@ -138,14 +137,14 @@ impl<'a> Iterator for StreamIter<'a> {
 }
 
 pub struct Demuxer<'a> {
-    dmx:        Box<DemuxCore<'a> + 'a>,
+    dmx:        Box<dyn DemuxCore<'a> + 'a>,
     streams:    StreamManager,
 }
 
 impl<'a> Demuxer<'a> {
-    fn new(dmx: Box<DemuxCore<'a> + 'a>, str: StreamManager) -> Self {
+    fn new(dmx: Box<dyn DemuxCore<'a> + 'a>, str: StreamManager) -> Self {
         Demuxer {
-            dmx:        dmx,
+            dmx,
             streams:    str,
         }
     }
@@ -194,7 +193,7 @@ impl From<ByteIOError> for DemuxerError {
 ///The structure used to create demuxers.
 pub trait DemuxerCreator {
     /// Create new demuxer instance that will use `ByteReader` source as an input.
-    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a>;
+    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a>;
     /// Get the name of current demuxer creator.
     fn get_name(&self) -> &'static str;
 }
@@ -206,6 +205,7 @@ pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) ->
     Ok(Demuxer::new(dmx, str))
 }
 
+#[derive(Default)]
 pub struct RegisteredDemuxers {
     dmxs:   Vec<&'static DemuxerCreator>,
 }