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

decoder/wavpack: rename struct wavpack_input to WavpackInput

Browse Source
This commit is contained in:
Max Kellermann 2014-05-22 10:52:34 +02:00
parent 49695d47d3
commit 631b635652
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,7 @@ wavpack_scan_file(Path path_fs,
*/ */
/* This struct is needed for per-stream last_byte storage. */ /* This struct is needed for per-stream last_byte storage. */
struct wavpack_input { struct WavpackInput {
Decoder *decoder; Decoder *decoder;
InputStream *is; InputStream *is;
/* Needed for push_back_byte() */ /* Needed for push_back_byte() */
@ -333,13 +333,13 @@ struct wavpack_input {
}; };
/** /**
* Little wrapper for struct wavpack_input to cast from void *. * Little wrapper for struct WavpackInput to cast from void *.
*/ */
static struct wavpack_input * static WavpackInput *
wpin(void *id) wpin(void *id)
{ {
assert(id); assert(id);
return (struct wavpack_input *)id; return (WavpackInput *)id;
} }
static int32_t static int32_t
@ -430,7 +430,7 @@ static WavpackStreamReader mpd_is_reader = {
}; };
static void static void
wavpack_input_init(struct wavpack_input *isp, Decoder &decoder, wavpack_input_init(WavpackInput *isp, Decoder &decoder,
InputStream &is) InputStream &is)
{ {
isp->decoder = &decoder; isp->decoder = &decoder;
@ -441,7 +441,7 @@ wavpack_input_init(struct wavpack_input *isp, Decoder &decoder,
static InputStream * static InputStream *
wavpack_open_wvc(Decoder &decoder, const char *uri, wavpack_open_wvc(Decoder &decoder, const char *uri,
Mutex &mutex, Cond &cond, Mutex &mutex, Cond &cond,
struct wavpack_input *wpi) WavpackInput *wpi)
{ {
/* /*
* As we use dc->utf8url, this function will be bad for * As we use dc->utf8url, this function will be bad for
@ -486,7 +486,7 @@ wavpack_streamdecode(Decoder &decoder, InputStream &is)
int open_flags = OPEN_NORMALIZE; int open_flags = OPEN_NORMALIZE;
bool can_seek = is.IsSeekable(); bool can_seek = is.IsSeekable();
wavpack_input isp_wvc; WavpackInput isp_wvc;
InputStream *is_wvc = wavpack_open_wvc(decoder, is.GetURI(), InputStream *is_wvc = wavpack_open_wvc(decoder, is.GetURI(),
is.mutex, is.cond, is.mutex, is.cond,
&isp_wvc); &isp_wvc);
@ -499,7 +499,7 @@ wavpack_streamdecode(Decoder &decoder, InputStream &is)
open_flags |= OPEN_STREAMING; open_flags |= OPEN_STREAMING;
} }
wavpack_input isp; WavpackInput isp;
wavpack_input_init(&isp, decoder, is); wavpack_input_init(&isp, decoder, is);
char error[ERRORLEN]; char error[ERRORLEN];