decoder/dsf: count the blocks, not the remaining bytes

Prepare refactoring the whole plugin to use blocks instead of bytes. A block is the smallest addressable unit, and it will simplify the seeking code.

decoder/dsf: count the blocks, not the remaining bytes
6fe06cad · Max Kellermann · 2335fdbb · 6fe06cad
Commit 6fe06cad authored Aug 23, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

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

No files found.
--- a/src/decoder/plugins/DsfDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsfDecoderPlugin.cxx
@@ -255,9 +255,9 @@ dsf_decode_chunk(Decoder &decoder, InputStream &is,

 	const size_t block_size = channels * DSF_BLOCK_SIZE;

-	while (chunk_size >= block_size) {
-		chunk_size -= block_size;
+	const offset_type n_blocks = chunk_size / block_size;

+	for (offset_type i = 0; i < n_blocks;) {
 		if (!decoder_read_full(&decoder, is, buffer, block_size))
 			return false;

@@ -272,6 +272,7 @@ dsf_decode_chunk(Decoder &decoder, InputStream &is,
 					      sample_rate / 1000);
 		switch (cmd) {
 		case DecoderCommand::NONE:
+			++i;
 			break;

 		case DecoderCommand::START: