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

decoder/wavpack: add local reference variables

Browse Source
This commit is contained in:
Max Kellermann 2014-08-19 20:58:08 +02:00
parent 106e535577
commit 9be90bd1c9
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,19 +386,24 @@ WavpackInput::ReadBytes(void *data, size_t bcount)
static uint32_t static uint32_t
wavpack_input_get_pos(void *id) wavpack_input_get_pos(void *id)
{ {
return wpin(id)->is.GetOffset(); WavpackInput &wpi = *wpin(id);
return wpi.is.GetOffset();
} }
static int static int
wavpack_input_set_pos_abs(void *id, uint32_t pos) wavpack_input_set_pos_abs(void *id, uint32_t pos)
{ {
return wpin(id)->is.LockSeek(pos, IgnoreError()) ? 0 : -1; WavpackInput &wpi = *wpin(id);
return wpi.is.LockSeek(pos, IgnoreError()) ? 0 : -1;
} }
static int static int
wavpack_input_set_pos_rel(void *id, int32_t delta, int mode) wavpack_input_set_pos_rel(void *id, int32_t delta, int mode)
{ {
InputStream &is = wpin(id)->is; WavpackInput &wpi = *wpin(id);
InputStream &is = wpi.is;
InputStream::offset_type offset = delta; InputStream::offset_type offset = delta;
switch (mode) { switch (mode) {
@ -426,8 +431,10 @@ wavpack_input_set_pos_rel(void *id, int32_t delta, int mode)
static int static int
wavpack_input_push_back_byte(void *id, int c) wavpack_input_push_back_byte(void *id, int c)
{ {
if (wpin(id)->last_byte == EOF) { WavpackInput &wpi = *wpin(id);
wpin(id)->last_byte = c;
if (wpi.last_byte == EOF) {
wpi.last_byte = c;
return c; return c;
} else { } else {
return EOF; return EOF;
@ -437,16 +444,22 @@ wavpack_input_push_back_byte(void *id, int c)
static uint32_t static uint32_t
wavpack_input_get_length(void *id) wavpack_input_get_length(void *id)
{ {
if (!wpin(id)->is.KnownSize()) WavpackInput &wpi = *wpin(id);
InputStream &is = wpi.is;
if (!is.KnownSize())
return 0; return 0;
return wpin(id)->is.GetSize(); return is.GetSize();
} }
static int static int
wavpack_input_can_seek(void *id) wavpack_input_can_seek(void *id)
{ {
return wpin(id)->is.IsSeekable(); WavpackInput &wpi = *wpin(id);
InputStream &is = wpi.is;
return is.IsSeekable();
} }
static WavpackStreamReader mpd_is_reader = { static WavpackStreamReader mpd_is_reader = {