X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-llaudio%2Fsrc%2Fcodecs%2Fmod.rs;h=4f2a21a35d70d82f7dd12584edfc6306b6fd7fa9;hb=6bd5b458d9889f092abe9b582bd531ed08a8dc51;hp=5cc1769e9f43703036c01f76a5beebb7c2c1727c;hpb=87927c5732b39bb23209486bed8d7bb7fc56b92e;p=nihav.git

diff --git a/nihav-llaudio/src/codecs/mod.rs b/nihav-llaudio/src/codecs/mod.rs
index 5cc1769..4f2a21a 100644
--- a/nihav-llaudio/src/codecs/mod.rs
+++ b/nihav-llaudio/src/codecs/mod.rs
@@ -1,8 +1,13 @@
 use nihav_core::codecs::*;
 
+#[cfg(debug_assertions)]
 macro_rules! validate {
     ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } };
 }
+#[cfg(not(debug_assertions))]
+macro_rules! validate {
+    ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } };
+}
 
 #[cfg(feature="decoder_ape")]
 pub mod ape;
@@ -34,6 +39,33 @@ const LL_AUDIO_CODECS: &[DecoderInfo] = &[
 /// Registers all available codecs provided by this crate.
 pub fn llaudio_register_all_decoders(rd: &mut RegisteredDecoders) {
     for decoder in LL_AUDIO_CODECS.iter() {
-        rd.add_decoder(decoder.clone());
+        rd.add_decoder(*decoder);
+    }
+}
+
+const LL_PACKETISERS: &[PacketiserInfo] = &[
+#[cfg(feature="decoder_flac")]
+    PacketiserInfo { name: "flac", get_packetiser: flac::get_packetiser },
+];
+
+/// Registers all available packetisers provided by this crate.
+pub fn llaudio_register_all_packetisers(rp: &mut RegisteredPacketisers) {
+    for pkt in LL_PACKETISERS.iter() {
+        rp.add_packetiser(*pkt);
+    }
+}
+
+#[cfg(feature="encoder_flac")]
+pub mod flacenc;
+
+const LL_AUDIO_ENCODERS: &[EncoderInfo] = &[
+#[cfg(feature="decoder_flac")]
+    EncoderInfo { name: "flac", get_encoder: flacenc::get_encoder },
+];
+
+/// Registers all available encoders provided by this crate.
+pub fn llaudio_register_all_encoders(re: &mut RegisteredEncoders) {
+    for encoder in LL_AUDIO_ENCODERS.iter() {
+        re.add_encoder(*encoder);
     }
 }