diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-26 19:54:57 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-26 19:54:57 +0100 |
| commit | 21b8590b53699f92802cb95121e910033cbd4f11 (patch) | |
| tree | 0a1d8fde8468929479d38a1e96e4938542e1d80a /src/decoder/wavpack_plugin.c | |
| parent | bbaedb17d52cf14cf1abc3f24a90dfa06f875440 (diff) | |
| download | mpd-21b8590b53699f92802cb95121e910033cbd4f11.tar.gz mpd-21b8590b53699f92802cb95121e910033cbd4f11.tar.xz mpd-21b8590b53699f92802cb95121e910033cbd4f11.zip | |
input_stream: removed the InputStream typedef
Everybody should use struct input_stream.
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/wavpack_plugin.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c index 14b7e5f69..515eb64ef 100644 --- a/src/decoder/wavpack_plugin.c +++ b/src/decoder/wavpack_plugin.c @@ -333,13 +333,13 @@ static struct tag *wavpack_tagdup(char *fname) } /* - * mpd InputStream <=> WavpackStreamReader wrapper callbacks + * mpd input_stream <=> WavpackStreamReader wrapper callbacks */ /* This struct is needed for per-stream last_byte storage. */ typedef struct { struct decoder *decoder; - InputStream *is; + struct input_stream *is; /* Needed for push_back_byte() */ int last_byte; } InputStreamPlus; @@ -403,7 +403,7 @@ static WavpackStreamReader mpd_is_reader = { static void initInputStreamPlus(InputStreamPlus *isp, struct decoder *decoder, - InputStream *is) + struct input_stream *is) { isp->decoder = decoder; isp->is = is; @@ -413,7 +413,7 @@ initInputStreamPlus(InputStreamPlus *isp, struct decoder *decoder, /* * Tries to decode the specified stream, and gives true if managed to do it. */ -static bool wavpack_trydecode(InputStream *is) +static bool wavpack_trydecode(struct input_stream *is) { char error[ERRORLEN]; WavpackContext *wpc; @@ -433,7 +433,7 @@ static bool wavpack_trydecode(InputStream *is) } static int wavpack_open_wvc(struct decoder *decoder, - InputStream *is_wvc) + struct input_stream *is_wvc) { char tmp[MPD_PATH_MAX]; const char *utf8url; @@ -498,11 +498,12 @@ static int wavpack_open_wvc(struct decoder *decoder, /* * Decodes a stream. */ -static int wavpack_streamdecode(struct decoder * decoder, InputStream *is) +static int +wavpack_streamdecode(struct decoder * decoder, struct input_stream *is) { char error[ERRORLEN]; WavpackContext *wpc; - InputStream is_wvc; + struct input_stream is_wvc; int open_flags = OPEN_2CH_MAX | OPEN_NORMALIZE /*| OPEN_STREAMING*/; InputStreamPlus isp, isp_wvc; |