X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=214427ec296889d9130a8dde15e7079a684bb258;hp=b57e3611953ab6ad83b093f779416ebec465b320;hb=98b31ef77be7fdff7d8b209358b37626a5cb7be7;hpb=417ba15eea92979575a8452f6b34162330b56e1f

diff --git a/src/main.rs b/src/main.rs
index b57e361..214427e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,20 +1,22 @@
-extern crate nihav;
+extern crate nihav_core;
+extern crate nihav_allstuff;
 
 use std::io::SeekFrom;
 use std::fs::File;
 use std::path::Path;
-use nihav::io::byteio::{FileReader, ByteReader};
-use nihav::frame::*;
-use nihav::codecs::*;
-use nihav::demuxers::*;
-use nihav::detect;
+use nihav_core::io::byteio::{FileReader, ByteReader};
+use nihav_core::frame::*;
+use nihav_core::codecs::*;
+use nihav_core::demuxers::*;
+use nihav_core::detect;
+use nihav_allstuff::*;
 use std::env;
 
 mod frmwriter;
-use frmwriter::*;
+use crate::frmwriter::*;
 
 mod wavwriter;
-use wavwriter::WavWriter;
+use crate::wavwriter::WavWriter;
 
 #[derive(Clone,Copy,PartialEq)]
 enum NumberMode {
@@ -117,7 +119,13 @@ fn main() {
     }
     let (dmx_name, _) = res.unwrap();
 println!("trying demuxer {} on {}", dmx_name, name);
-    dmx_fact = find_demuxer(dmx_name).unwrap();
+
+    let mut dmx_reg = RegisteredDemuxers::new();
+    nihav_register_all_demuxers(&mut dmx_reg);
+    let mut dec_reg = RegisteredDecoders::new();
+    nihav_register_all_codecs(&mut dec_reg);
+
+    dmx_fact = dmx_reg.find_demuxer(dmx_name).unwrap();
     br.seek(SeekFrom::Start(0)).unwrap();
     let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
 
@@ -127,7 +135,7 @@ println!("trying demuxer {} on {}", dmx_name, name);
     for i in 0..dmx.get_num_streams() {
         let s = dmx.get_stream(i).unwrap();
         let info = s.get_info();
-        let decfunc = find_decoder(info.get_name());
+        let decfunc = dec_reg.find_decoder(info.get_name());
 println!("stream {} - {} {}", i, s, info.get_name());
         let str_id = s.get_id();
         let mut has_out = false;