oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

InputStream: make Seek() always absolute

Browse Source 
Remove the "whence" parameter that is not actually necessary, and only
complicates the InputStream implementations.
This commit is contained in:
Max Kellermann
2014-05-22 10:10:16 +02:00
parent 374c6a27db
commit 07b93dcf80
28 changed files with 184 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@@ -392,13 +392,35 @@ wavpack_input_get_pos(void *id)
static int
wavpack_input_set_pos_abs(void *id, uint32_t pos)
{
return wpin(id)->is.LockSeek(pos, SEEK_SET, IgnoreError()) ? 0 : -1;
return wpin(id)->is.LockSeek(pos, IgnoreError()) ? 0 : -1;
}
static int
wavpack_input_set_pos_rel(void *id, int32_t delta, int mode)
{
return wpin(id)->is.LockSeek(delta, mode, IgnoreError()) ? 0 : -1;
InputStream &is = wpin(id)->is;
InputStream::offset_type offset = delta;
switch (mode) {
case SEEK_SET:
break;
case SEEK_CUR:
offset += is.GetOffset();
break;
case SEEK_END:
if (!is.KnownSize())
return -1;
offset += is.GetSize();
break;
default:
return -1;
}
return is.LockSeek(offset, IgnoreError()) ? 0 : -1;
}
static int