Mercurial > audlegacy
changeset 2289:dcac9f84176d trunk
[svn] - strenghtened penalty check in playback_initiate to handle some extreme situations (such as no output plugins loaded)
| author | giacomo |
|---|---|
| date | Sat, 06 Jan 2007 13:29:29 -0800 |
| parents | 64a9db251832 |
| children | 9fc150e3542e |
| files | ChangeLog audacious/playback.c |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 06 12:33:11 2007 -0800 +++ b/ChangeLog Sat Jan 06 13:29:29 2007 -0800 @@ -1,3 +1,10 @@ +2007-01-06 20:33:11 +0000 Giacomo Lozito <james@develia.org> + revision [3584] + - fix uninitialized integer, that was bringing troubles if the last playlist item was not available for playback + trunk/audacious/playback.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-01-06 03:25:19 +0000 William Pitcock <nenolod@nenolod.net> revision [3582] - update to objective-make II
--- a/audacious/playback.c Sat Jan 06 12:33:11 2007 -0800 +++ b/audacious/playback.c Sat Jan 06 13:29:29 2007 -0800 @@ -108,7 +108,7 @@ * * - nenolod */ - while (entry != NULL && !playback_play_file(entry)) + for ( penalty=0 ; penalty <= 15 && entry != NULL && !playback_play_file(entry) ; penalty++ ) { playlist_next(playlist); @@ -120,14 +120,13 @@ if (entry == NULL) return; - if (entry->decoder == NULL && - (entry->decoder = input_check_file(entry->filename, FALSE)) == NULL) - penalty++; + if (entry->decoder == NULL ) + entry->decoder = input_check_file(entry->filename, FALSE); /* if we hit 15 entries in a row with no valid decoder, just * bail due to confusion */ - if (penalty > 15) + if (penalty == 15) return; }