From cae7e0029a75b2cc2b601e41dbf26cded91ba8de Mon Sep 17 00:00:00 2001 From: moritz Date: Sat, 22 Aug 2009 10:03:45 +0000 Subject: [PATCH] #1585: Continue when openResource() fails. git-svn-id: https://svn.xiph.org/trunk/ezstream@16497 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- NEWS | 9 +++++++++ src/ezstream.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index f702623..4833a32 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +Changes in 0.5.6, released on XXXX-XX-XX: + + * src/ezstream.c: + - [MISC] Be more tolerant towards faulty playlists and similar issues. + Failure to open a resource (e.g. a media file) is no longer fatal + and operation will continue as far as possible. Idea from dhorton. + (Ticket #1585) + + Changes in 0.5.5, released on 2009-08-01: * win32/config.h: diff --git a/src/ezstream.c b/src/ezstream.c index 46ec685..93a776a 100644 --- a/src/ezstream.c +++ b/src/ezstream.c @@ -874,9 +874,9 @@ streamFile(shout_t *shout, const char *fileName) if ((filepstream = openResource(shout, fileName, &popenFlag, &mdata, &isStdin, &songLen)) - == NULL) { - return (retval); - } + == NULL) + /* Continue with next resource on failure: */ + return (1); if (mdata != NULL) { char *tmp, *metaData;