split configuration for audio and video SMUSH decoders

[nihav.git] / nihav-game / src / codecs / mod.rs

diff --git a/nihav-game/src/codecs/mod.rs b/nihav-game/src/codecs/mod.rs
index b65bcc89cc11a4e7e20c8dc5a37998536934f163..c75e26324cd78fcd1267058f531abe3d23a09d4b 100644 (file)
--- a/nihav-game/src/codecs/mod.rs
+++ b/nihav-game/src/codecs/mod.rs
@@ -25,7 +25,7 @@ pub mod midivid;
 pub mod midivid3;
 #[cfg(feature="decoder_q")]
 pub mod q;
 pub mod midivid3;
 #[cfg(feature="decoder_q")]
 pub mod q;

-#[cfg(feature="decoder_smush")]
+#[cfg(any(feature="decoder_smush_video", feature="decoder_smush_audio"))]

 pub mod smush;
 #[cfg(feature="decoder_vmd")]
 pub mod vmd;
 pub mod smush;
 #[cfg(feature="decoder_vmd")]
 pub mod vmd;


@@ -59,13 +59,13 @@ const GAME_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "ipma2", get_decoder: ipma::get_decoder_v2 },
 #[cfg(feature="decoder_q")]
     DecoderInfo { name: "legend-q-video", get_decoder: q::get_decoder },
     DecoderInfo { name: "ipma2", get_decoder: ipma::get_decoder_v2 },
 #[cfg(feature="decoder_q")]
     DecoderInfo { name: "legend-q-video", get_decoder: q::get_decoder },

-#[cfg(feature="decoder_smush")]
+#[cfg(feature="decoder_smush_video")]

     DecoderInfo { name: "smushv1", get_decoder: smush::get_decoder_video_v1 },
     DecoderInfo { name: "smushv1", get_decoder: smush::get_decoder_video_v1 },

-#[cfg(feature="decoder_smush")]
+#[cfg(feature="decoder_smush_video")]

     DecoderInfo { name: "smushv2", get_decoder: smush::get_decoder_video_v2 },
     DecoderInfo { name: "smushv2", get_decoder: smush::get_decoder_video_v2 },

-#[cfg(feature="decoder_smush")]
+#[cfg(feature="decoder_smush_audio")]

     DecoderInfo { name: "smush-iact", get_decoder: smush::get_decoder_iact },
     DecoderInfo { name: "smush-iact", get_decoder: smush::get_decoder_iact },

-#[cfg(feature="decoder_smush")]
+#[cfg(feature="decoder_smush_audio")]

     DecoderInfo { name: "smush-vima", get_decoder: smush::get_decoder_vima },
 #[cfg(feature="decoder_vmd")]
     DecoderInfo { name: "vmd-audio", get_decoder: vmd::get_decoder_audio },
     DecoderInfo { name: "smush-vima", get_decoder: smush::get_decoder_vima },
 #[cfg(feature="decoder_vmd")]
     DecoderInfo { name: "vmd-audio", get_decoder: vmd::get_decoder_audio },