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

wavpack: added InputStreamPlus.decoder

Browse Source 
The "decoder" object reference will be used by another patch.
This commit is contained in:
Max Kellermann
2008-08-26 08:27:14 +02:00
parent a1b430cb88
commit d80260ab4e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/inputPlugins/wavpack_plugin.c
View File

@@ -340,6 +340,7 @@ static MpdTag *wavpack_tagdup(char *fname)
/* This struct is needed for per-stream last_byte storage. */ /* This struct is needed for per-stream last_byte storage. */
typedef struct { typedef struct {
struct decoder *decoder;
InputStream *is; InputStream *is;
/* Needed for push_back_byte() */ /* Needed for push_back_byte() */
int last_byte; int last_byte;
@@ -403,8 +404,10 @@ static WavpackStreamReader mpd_is_reader = {
}; };
static void static void
initInputStreamPlus(InputStreamPlus *isp, InputStream *is) initInputStreamPlus(InputStreamPlus *isp, struct decoder *decoder,
InputStream *is)
{ {
isp->decoder = decoder;
isp->is = is; isp->is = is;
isp->last_byte = EOF; isp->last_byte = EOF;
} }
@@ -418,7 +421,7 @@ static unsigned int wavpack_trydecode(InputStream *is)
WavpackContext *wpc; WavpackContext *wpc;
InputStreamPlus isp; InputStreamPlus isp;
initInputStreamPlus(&isp, is); initInputStreamPlus(&isp, NULL, is);
wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, NULL, error, wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, NULL, error,
OPEN_STREAMING, 0); OPEN_STREAMING, 0);
if (wpc == NULL) if (wpc == NULL)
@@ -520,11 +523,11 @@ static int wavpack_streamdecode(struct decoder * decoder, InputStream *is)
free(wvc_url); free(wvc_url);
wvc_url = NULL; wvc_url = NULL;
} else { } 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, wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, &isp_wvc, error,
open_flags, 15); open_flags, 15);