X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fmod.rs;h=3caa51c1ba232db68c5923e71c85e6b8c00ef49b;hb=0c9b706ab86de253938471cde127abde866210dd;hp=bd2d6eb9e0920d04c3210e44c6eb60674e20adc9;hpb=3e52414f742a961885778d9c851224176a851405;p=nihav.git diff --git a/nihav-game/src/codecs/mod.rs b/nihav-game/src/codecs/mod.rs index bd2d6eb..3caa51c 100644 --- a/nihav-game/src/codecs/mod.rs +++ b/nihav-game/src/codecs/mod.rs @@ -8,8 +8,12 @@ macro_rules! validate { pub mod bmv; #[cfg(feature="decoder_bmv3")] pub mod bmv3; +#[cfg(any(feature="decoder_fstvid",feature="decoder_fstaud"))] +pub mod futurevision; #[cfg(feature="decoder_gdvvid")] pub mod gremlinvideo; +#[cfg(feature="decoder_imax")] +pub mod imax; #[cfg(feature="decoder_lhst500f22")] pub mod lhst500f22; #[cfg(feature="decoder_midivid")] @@ -18,6 +22,10 @@ pub mod midivid; pub mod midivid3; #[cfg(feature="decoder_vmd")] pub mod vmd; +#[cfg(feature="decoder_vx")] +#[allow(clippy::erasing_op)] +#[allow(clippy::identity_op)] +pub mod vx; const GAME_CODECS: &[DecoderInfo] = &[ #[cfg(feature="decoder_gdvvid")] @@ -32,6 +40,12 @@ const GAME_CODECS: &[DecoderInfo] = &[ DecoderInfo { name: "bmv3-audio", get_decoder: bmv3::get_decoder_audio }, #[cfg(feature="decoder_bmv3")] DecoderInfo { name: "bmv3-video", get_decoder: bmv3::get_decoder_video }, +#[cfg(feature="decoder_fstaud")] + DecoderInfo { name: "fst-audio", get_decoder: futurevision::get_decoder_audio }, +#[cfg(feature="decoder_fstvid")] + DecoderInfo { name: "fst-video", get_decoder: futurevision::get_decoder_video }, +#[cfg(feature="decoder_imax")] + DecoderInfo { name: "fable-imax", get_decoder: imax::get_decoder }, #[cfg(feature="decoder_vmd")] DecoderInfo { name: "vmd-audio", get_decoder: vmd::get_decoder_audio }, #[cfg(feature="decoder_vmd")] @@ -42,11 +56,15 @@ const GAME_CODECS: &[DecoderInfo] = &[ DecoderInfo { name: "midivid", get_decoder: midivid::get_decoder_video }, #[cfg(feature="decoder_midivid3")] DecoderInfo { name: "midivid3", get_decoder: midivid3::get_decoder_video }, +#[cfg(feature="decoder_vx")] + DecoderInfo { name: "vxaudio", get_decoder: vx::get_decoder_audio }, +#[cfg(feature="decoder_vx")] + DecoderInfo { name: "vxvideo", get_decoder: vx::get_decoder_video }, ]; /// Registers all available codecs provided by this crate. -pub fn game_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn game_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in GAME_CODECS.iter() { - rd.add_decoder(decoder.clone()); + rd.add_decoder(*decoder); } }