X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fdemuxers%2Fmod.rs;h=820dd2eea79d102da70a53b36a5b2b15f8506603;hb=71d7f39706f0f5004820f8d1d36c87d5f9ec3e97;hp=5acf1f419f985dd155f6b31ed7870d83b56175a8;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00;p=nihav.git diff --git a/nihav-realmedia/src/demuxers/mod.rs b/nihav-realmedia/src/demuxers/mod.rs index 5acf1f4..820dd2e 100644 --- a/nihav-realmedia/src/demuxers/mod.rs +++ b/nihav-realmedia/src/demuxers/mod.rs @@ -1,14 +1,20 @@ -use std::rc::Rc; use nihav_core::demuxers::*; +#[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(feature="demuxer_real")] +#[allow(clippy::identity_op)] +#[allow(clippy::needless_range_loop)] mod realmedia; -const RM_DEMUXERS: &[&'static DemuxerCreator] = &[ +const RM_DEMUXERS: &[&dyn DemuxerCreator] = &[ #[cfg(feature="demuxer_real")] &realmedia::RealMediaDemuxerCreator {}, #[cfg(feature="demuxer_real")] @@ -17,8 +23,9 @@ const RM_DEMUXERS: &[&'static DemuxerCreator] = &[ &realmedia::RealIVRDemuxerCreator {}, ]; +/// Registers all available demuxers provided by this crate. pub fn realmedia_register_all_demuxers(rd: &mut RegisteredDemuxers) { - for demuxer in RM_DEMUXERS.into_iter() { + for demuxer in RM_DEMUXERS.iter() { rd.add_demuxer(*demuxer); } }