X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fmod.rs;h=7895afd619b75348ce814e3cb03382a7c3654ca2;hb=fead60e32f35ca21262769174a23f6b4735bf28e;hp=ca85790ed0a8bf242392d4c20319ee74cbee0268;hpb=ff6a914f5b07a9c62d7624fb6dd9f1fc093e82ca;p=nihav.git diff --git a/nihav-game/src/demuxers/mod.rs b/nihav-game/src/demuxers/mod.rs index ca85790..7895afd 100644 --- a/nihav-game/src/demuxers/mod.rs +++ b/nihav-game/src/demuxers/mod.rs @@ -1,12 +1,19 @@ use nihav_core::demuxers::*; #[allow(unused_macros)] +#[cfg(debug_assertions)] macro_rules! validate { ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } }; } +#[cfg(not(debug_assertions))] +macro_rules! validate { + ($a:expr) => { if !$a { return Err(DemuxerError::InvalidData); } }; +} #[cfg(any(feature="demuxer_bmv",feature="demuxer_bmv3"))] mod bmv; +#[cfg(feature="demuxer_cnm")] +mod cnm; #[cfg(any(feature="demuxer_fst",feature="demuxer_fcmp"))] mod fst; #[cfg(feature="demuxer_gdv")] @@ -17,6 +24,10 @@ mod hl_fmv; mod imax; #[cfg(feature="demuxer_q")] mod q; +#[cfg(feature="demuxer_sga")] +mod sga; +#[cfg(feature="demuxer_siff")] +mod siff; #[cfg(feature="demuxer_smush")] mod smush; #[cfg(feature="demuxer_vmd")] @@ -29,6 +40,8 @@ const GAME_DEMUXERS: &[&dyn DemuxerCreator] = &[ &bmv::BMVDemuxerCreator {}, #[cfg(feature="demuxer_bmv3")] &bmv::BMV3DemuxerCreator {}, +#[cfg(feature="demuxer_cnm")] + &cnm::CNMDemuxerCreator {}, #[cfg(feature="demuxer_fcmp")] &fst::FCMPDemuxerCreator {}, #[cfg(feature="demuxer_fst")] @@ -41,6 +54,10 @@ const GAME_DEMUXERS: &[&dyn DemuxerCreator] = &[ &imax::IMAXDemuxerCreator {}, #[cfg(feature="demuxer_q")] &q::QDemuxerCreator {}, +#[cfg(feature="demuxer_sga")] + &sga::SGADemuxerCreator {}, +#[cfg(feature="demuxer_siff")] + &siff::SIFFDemuxerCreator {}, #[cfg(feature="demuxer_smush")] &smush::SmushDemuxerCreator {}, #[cfg(feature="demuxer_smush")]