X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-llaudio%2Fsrc%2Fdemuxers%2Fflacraw.rs;h=dcdd5a5b9be9082cf4a7a971eaa0bc3f543ea00d;hb=c6432d30823e5b5372e74290b34bf89af6ece52f;hp=e8d1f4ae204ed2dc18366078218ef810fb37f318;hpb=886cde4847280b96e10d240c2f2d76abec121dc8;p=nihav.git diff --git a/nihav-llaudio/src/demuxers/flacraw.rs b/nihav-llaudio/src/demuxers/flacraw.rs index e8d1f4a..dcdd5a5 100644 --- a/nihav-llaudio/src/demuxers/flacraw.rs +++ b/nihav-llaudio/src/demuxers/flacraw.rs @@ -90,7 +90,7 @@ impl<'a> RawDemuxCore<'a> for FLACDemuxer<'a> { self.srate = srate; let base = if self.blk_samples != 0 { u32::from(self.blk_samples) } else { 1 }; - let ahdr = NAAudioInfo::new(srate, channels as u8, SND_S16P_FORMAT, base as usize); + let ahdr = NAAudioInfo::new(srate, channels, SND_S16P_FORMAT, base as usize); let ainfo = NACodecInfo::new("flac", NACodecTypeInfo::Audio(ahdr), Some(streaminfo)); strmgr.add_stream(NAStream::new(StreamType::Audio, 0, ainfo, base, srate, 0)).unwrap(); @@ -137,11 +137,7 @@ impl RawDemuxerCreator for FLACDemuxerCreator { if br.seek(SeekFrom::Start(0)).is_err() { return false; } - if let Ok([b'f', b'L', b'a', b'C']) = br.read_tag() { - true - } else { - false - } + matches!(br.read_tag(), Ok([b'f', b'L', b'a', b'C'])) } }