diff options
| author | Max Kellermann <max@duempel.org> | 2014-07-11 21:33:50 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-07-11 21:33:50 +0200 |
| commit | 828cd6fd0b8838edb39e6b3f62397a5fe369e1d5 (patch) | |
| tree | 62bfa8fdaaf846a5a4c18e6607ef8f1e8f13c8a2 /src/decoder/plugins/AudiofileDecoderPlugin.cxx | |
| parent | 681643ea9e6e196c449f1974cd50e1f400da3450 (diff) | |
| parent | ecb67a1ed16e93f5fe552b28631e517060115648 (diff) | |
| download | mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.tar.gz mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.tar.xz mpd-828cd6fd0b8838edb39e6b3f62397a5fe369e1d5.zip | |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/decoder/plugins/AudiofileDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/plugins/AudiofileDecoderPlugin.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx index 603f714d1..93a6e03a2 100644 --- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx +++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx @@ -55,7 +55,7 @@ struct AudioFileInputStream { size_t Read(void *buffer, size_t size) { /* libaudiofile does not like partial reads at all, - and wil abort playback; therefore always force full + and will abort playback; therefore always force full reads */ return decoder_read_full(decoder, is, buffer, size) ? size @@ -118,9 +118,11 @@ audiofile_file_seek(AFvirtualfile *vfile, AFfileoffset _offset, if (is_relative) offset += is.GetOffset(); - if (is.LockSeek(offset, IgnoreError())) { + Error error; + if (is.LockSeek(offset, error)) { return is.GetOffset(); } else { + LogError(error, "Seek failed"); return -1; } } |