diff options
author | Max Kellermann <max@duempel.org> | 2014-07-09 20:02:07 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-07-09 20:02:07 +0200 |
commit | 913064d6cc0dcfddb4eee0dcddacc5c82fa31448 (patch) | |
tree | 9ca3e14da0d2c355a65170ad994d47c1ac60c17a /src/decoder/plugins/DsdLib.cxx | |
parent | fb45b8a5c94070d30e9a8ef33b04cb44c113515b (diff) | |
parent | 09384df32cc6bef40bc3630de1c928d2eb424909 (diff) | |
download | mpd-913064d6cc0dcfddb4eee0dcddacc5c82fa31448.tar.gz mpd-913064d6cc0dcfddb4eee0dcddacc5c82fa31448.tar.xz mpd-913064d6cc0dcfddb4eee0dcddacc5c82fa31448.zip |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/decoder/plugins/DsdLib.cxx')
-rw-r--r-- | src/decoder/plugins/DsdLib.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index c52c504e6..0f10b20e9 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -45,14 +45,6 @@ DsdId::Equals(const char *s) const return memcmp(value, s, sizeof(value)) == 0; } -bool -dsdlib_read(Decoder *decoder, InputStream &is, - void *data, size_t length) -{ - size_t nbytes = decoder_read(decoder, is, data, length); - return nbytes == length; -} - /** * Skip the #input_stream to the specified offset. */ @@ -123,7 +115,7 @@ dsdlib_tag_id3(InputStream &is, id3_byte_t *dsdid3data; dsdid3data = dsdid3; - if (!dsdlib_read(nullptr, is, dsdid3data, count)) + if (!decoder_read_full(nullptr, is, dsdid3data, count)) return; id3_tag = id3_tag_parse(dsdid3data, count); |