X-Git-Url: https://git.nihav.org/?p=nihav-player.git;a=blobdiff_plain;f=sndplay%2Fsrc%2Fmain.rs;h=bdd64dcdaa60a4a501917f622a607e2a02f10686;hp=e1b8472886a93aab83ed46cecd65846b1d47d67b;hb=41e41352fa239e4cbaf355b91a685fc99bef573f;hpb=3f9b450c63b8876a2925268f08ad34c97a0bc16d diff --git a/sndplay/src/main.rs b/sndplay/src/main.rs index e1b8472..bdd64dc 100644 --- a/sndplay/src/main.rs +++ b/sndplay/src/main.rs @@ -2,7 +2,6 @@ extern crate libc; extern crate sdl2_sys; extern crate nihav_core; extern crate nihav_registry; -extern crate nihav_allstuff; use std::fs::File; use std::io::prelude::*; @@ -17,8 +16,8 @@ use nihav_core::codecs::*; use nihav_core::demuxers::*; use nihav_core::soundcvt::*; use nihav_registry::detect; -use nihav_allstuff::*; +mod allreg; mod command; use command::*; @@ -214,9 +213,9 @@ fn format_time(ms: u64) -> String { impl Player { fn new() -> Self { let mut dmx_reg = RegisteredDemuxers::new(); - nihav_register_all_demuxers(&mut dmx_reg); + allreg::register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - nihav_register_all_decoders(&mut dec_reg); + allreg::register_all_decoders(&mut dec_reg); unsafe { if sdl2_sys::SDL_Init(sdl2_sys::SDL_INIT_AUDIO) != 0 {