aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-11-23 18:30:06 +0100
committerMax Kellermann <max@duempel.org>2013-11-23 18:30:12 +0100
commit73f45d87d5d3fd078bdf9acd3077e4c8b6a638c9 (patch)
tree8c428d8695b6ccdc7ccef79a1e34f53a2ca17772
parentae88ba986e0c50d922845f65d9b432404f41c532 (diff)
downloadmpd-73f45d87d5d3fd078bdf9acd3077e4c8b6a638c9.tar.gz
mpd-73f45d87d5d3fd078bdf9acd3077e4c8b6a638c9.tar.xz
mpd-73f45d87d5d3fd078bdf9acd3077e4c8b6a638c9.zip
decoder/{dsf,dsdiff}: eliminate useless assignments
-rw-r--r--src/decoder/DsdiffDecoderPlugin.cxx5
-rw-r--r--src/decoder/DsfDecoderPlugin.cxx4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx
index 347f5b586..a3c0149b9 100644
--- a/src/decoder/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/DsdiffDecoderPlugin.cxx
@@ -294,7 +294,6 @@ dsdiff_read_metadata_extra(Decoder *decoder, InputStream &is,
if (!dsdiff_read_chunk_header(decoder, is, chunk_header))
return false;
}
- chunk_size = 0;
}
/* done processing chunk headers, process tags if any */
@@ -385,10 +384,10 @@ dsdiff_decode_chunk(Decoder &decoder, InputStream &is,
while (chunk_size > 0) {
/* see how much aligned data from the remaining chunk
fits into the local buffer */
- unsigned now_frames = buffer_frames;
size_t now_size = buffer_size;
if (chunk_size < (uint64_t)now_size) {
- now_frames = (unsigned)chunk_size / frame_size;
+ unsigned now_frames =
+ (unsigned)chunk_size / frame_size;
now_size = now_frames * frame_size;
}
diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx
index 0507f5047..5ef94e647 100644
--- a/src/decoder/DsfDecoderPlugin.cxx
+++ b/src/decoder/DsfDecoderPlugin.cxx
@@ -240,10 +240,10 @@ dsf_decode_chunk(Decoder &decoder, InputStream &is,
while (chunk_size > 0) {
/* see how much aligned data from the remaining chunk
fits into the local buffer */
- unsigned now_frames = buffer_frames;
size_t now_size = buffer_size;
if (chunk_size < (uint64_t)now_size) {
- now_frames = (unsigned)chunk_size / frame_size;
+ unsigned now_frames =
+ (unsigned)chunk_size / frame_size;
now_size = now_frames * frame_size;
}