make an interface for working with demuxers

[nihav.git] / src / demuxers / avi.rs

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 034ef70e31e3f574f9bc3e882296399b51f561f7..8737fbf7354049537e9e2c3d45d0b9a673fa65cb 100644 (file)
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -38,7 +38,7 @@ impl StreamState {
 }
 
 #[allow(dead_code)]
-pub struct AVIDemuxer<'a> {
+struct AVIDemuxer<'a> {
     opened:         bool,
     src:            &'a mut ByteReader<'a>,
     cur_frame:      Vec<u64>,
@@ -106,7 +106,7 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
 }
 
 impl<'a> AVIDemuxer<'a> {
-    pub fn new(io: &'a mut ByteReader<'a>) -> Self {
+    fn new(io: &'a mut ByteReader<'a>) -> Self {
         AVIDemuxer {
             cur_frame: Vec::new(),
             num_streams: 0,
@@ -358,6 +358,15 @@ fn parse_junk(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     Ok(size)
 }
 
+pub struct AVIDemuxerCreator { }
+
+impl DemuxerCreator for AVIDemuxerCreator {
+    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<Demux<'a> + 'a> {
+        Box::new(AVIDemuxer::new(br))
+    }
+    fn get_name(&self) -> &'static str { "avi" }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;