make validate!() print message only in debug builds

[nihav.git] / nihav-commonfmt / src / demuxers / mod.rs

diff --git a/nihav-commonfmt/src/demuxers/mod.rs b/nihav-commonfmt/src/demuxers/mod.rs
index 84d21f049f0839b72ea548f3d0e0204845901901..32fe113cd4e07097cd08bb028048df79ae05bc2d 100644 (file)
--- a/nihav-commonfmt/src/demuxers/mod.rs
+++ b/nihav-commonfmt/src/demuxers/mod.rs
@@ -2,20 +2,42 @@ 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(feature="demuxer_avi")]
+#[allow(clippy::cast_lossless)]
 mod avi;
+#[cfg(feature="demuxer_mov")]
+#[allow(clippy::cast_lossless)]
+mod mov;
+#[cfg(feature="demuxer_wav")]
+mod wav;
+#[cfg(feature="demuxer_y4m")]
+mod y4m;
 
-const DEMUXERS: &[&'static DemuxerCreator] = &[
+const DEMUXERS: &[&dyn DemuxerCreator] = &[
 #[cfg(feature="demuxer_avi")]
     &avi::AVIDemuxerCreator {},
+#[cfg(feature="demuxer_mov")]
+    &mov::MOVDemuxerCreator {},
+#[cfg(feature="demuxer_mov")]
+    &mov::MacBinaryMOVDemuxerCreator {},
+#[cfg(feature="demuxer_wav")]
+    &wav::WAVDemuxerCreator {},
+#[cfg(feature="demuxer_y4m")]
+    &y4m::Y4MDemuxerCreator {},
 ];
 
+/// Registers all available demuxers provided by this crate.
 pub fn generic_register_all_demuxers(rd: &mut RegisteredDemuxers) {
-    for demuxer in DEMUXERS.into_iter() {
+    for demuxer in DEMUXERS.iter() {
         rd.add_demuxer(*demuxer);
     }
 }