projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
game: add Discworld Noir BMV demuxer and audio decoder
[nihav.git]
/
nihav-game
/
src
/
demuxers
/
mod.rs
diff --git
a/nihav-game/src/demuxers/mod.rs
b/nihav-game/src/demuxers/mod.rs
index 9d7d18728ceb0c85ac55c5d45eb2844dd040ea5e..884539c0f664fa78d31fb00ea16af60cdefc2188 100644
(file)
--- a/
nihav-game/src/demuxers/mod.rs
+++ b/
nihav-game/src/demuxers/mod.rs
@@
-5,7
+5,7
@@
macro_rules! validate {
($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
}
($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
}
-#[cfg(
feature="demuxer_bmv"
)]
+#[cfg(
any(feature="demuxer_bmv",feature="demuxer_bmv3")
)]
mod bmv;
#[cfg(feature="demuxer_gdv")]
mod gdv;
mod bmv;
#[cfg(feature="demuxer_gdv")]
mod gdv;
@@
-15,6
+15,8
@@
mod vmd;
const GAME_DEMUXERS: &[&'static DemuxerCreator] = &[
#[cfg(feature="demuxer_bmv")]
&bmv::BMVDemuxerCreator {},
const GAME_DEMUXERS: &[&'static DemuxerCreator] = &[
#[cfg(feature="demuxer_bmv")]
&bmv::BMVDemuxerCreator {},
+#[cfg(feature="demuxer_bmv3")]
+ &bmv::BMV3DemuxerCreator {},
#[cfg(feature="demuxer_gdv")]
&gdv::GDVDemuxerCreator {},
#[cfg(feature="demuxer_vmd")]
#[cfg(feature="demuxer_gdv")]
&gdv::GDVDemuxerCreator {},
#[cfg(feature="demuxer_vmd")]