The "decoder" object reference will be used by another patch.
---
src/inputPlugins/wavpack_plugin.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/inputPlugins/wavpack_plugin.c
b/src/inputPlugins/wavpack_plugin.c
index 9085ff8..00aa099 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -340,6 +340,7 @@ static MpdTag *wavpack_tagdup(char *fname)
/* This struct is needed for per-stream last_byte storage. */
typedef struct {
+ struct decoder *decoder;
InputStream *is;
/* Needed for push_back_byte() */
int last_byte;
@@ -403,8 +404,10 @@ static WavpackStreamReader mpd_is_reader = {
};
static void
-initInputStreamPlus(InputStreamPlus *isp, InputStream *is)
+initInputStreamPlus(InputStreamPlus *isp, struct decoder *decoder,
+ InputStream *is)
{
+ isp->decoder = decoder;
isp->is = is;
isp->last_byte = EOF;
}
@@ -418,7 +421,7 @@ static unsigned int wavpack_trydecode(InputStream *is)
WavpackContext *wpc;
InputStreamPlus isp;
- initInputStreamPlus(&isp, is);
+ initInputStreamPlus(&isp, NULL, is);
wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, NULL, error,
OPEN_STREAMING, 0);
if (wpc == NULL)
@@ -520,11 +523,11 @@ static int wavpack_streamdecode(struct decoder * decoder,
InputStream *is)
free(wvc_url);
wvc_url = NULL;
} else {
- initInputStreamPlus(&isp_wvc, &is_wvc);
+ initInputStreamPlus(&isp_wvc, decoder, &is_wvc);
}
}
- initInputStreamPlus(&isp, is);
+ initInputStreamPlus(&isp, decoder, is);
wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, &isp_wvc, error,
open_flags, 15);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
