decoder/dsf: allow channel setups other than stereo

This finishes the multi-channel support. Development of the feature was started with commit 02cc77cd

decoder/dsf: allow channel setups other than stereo
2335fdbb · Max Kellermann · 1b6f7c3e · 2335fdbb
Commit 2335fdbb authored Aug 23, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

DsfDecoderPlugin.cxx src/decoder/plugins/DsfDecoderPlugin.cxx +1 -2

No files found.
--- a/src/decoder/plugins/DsfDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsfDecoderPlugin.cxx
@@ -134,8 +134,7 @@ dsf_read_metadata(Decoder *decoder, InputStream &is,

 	if (FromLE32(dsf_fmt_chunk.version) != 1 ||
 	    FromLE32(dsf_fmt_chunk.formatid) != 0 ||
-	    FromLE32(dsf_fmt_chunk.channeltype) != 2 ||
-	    channels != 2 ||
+	    !audio_valid_channel_count(channels) ||
 	    !dsdlib_valid_freq(samplefreq))
 		return false;