From bf6191b00825c4631312cf2446fd7b181abb7e1f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 6 May 2013 17:27:27 +0200 Subject: Permit multiple HTTP errors in a row MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) Make sure that multiple bad playlists in a row don’t result in a temporary ban 2) Ignore songs skipped because the playlist timed out after pausing for too long --- src/player.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/player.c') diff --git a/src/player.c b/src/player.c index 16c94dc..939b326 100644 --- a/src/player.c +++ b/src/player.c @@ -489,7 +489,7 @@ void *BarPlayerThread (void *data) { default: BarUiMsg (player->settings, MSG_ERR, "Unsupported audio format!\n"); - ret = (void *) PLAYER_RET_ERR; + ret = (void *) PLAYER_RET_HARDFAIL; goto cleanup; break; } @@ -528,15 +528,14 @@ void *BarPlayerThread (void *data) { } if (player->aoError) { - ret = (void *) PLAYER_RET_ERR; + ret = (void *) PLAYER_RET_HARDFAIL; } /* Pandora sends broken audio url’s sometimes (“bad request”). ignore them. */ - if (wRet != WAITRESS_RET_OK && wRet != WAITRESS_RET_CB_ABORT && - wRet != WAITRESS_RET_BAD_REQUEST) { + if (wRet != WAITRESS_RET_OK && wRet != WAITRESS_RET_CB_ABORT) { BarUiMsg (player->settings, MSG_ERR, "Cannot access audio file: %s\n", WaitressErrorToStr (wRet)); - ret = (void *) PLAYER_RET_ERR; + ret = (void *) PLAYER_RET_SOFTFAIL; } cleanup: -- cgit v1.2.3