Mercurial > audlegacy
changeset 2592:6f7be3702c5f trunk
[svn] - revert the penalty-based "find something to play" logic of 1.2. it's
mostly irrelevant now, because entries should have a decoder mapped to
them by the time we get here now, and if they don't,
playback_play_file() can handle it.
| author | nenolod |
|---|---|
| date | Wed, 28 Feb 2007 09:52:22 -0800 |
| parents | f14a639354b3 |
| children | 65073812a5cf |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/playback.c |
| diffstat | 3 files changed, 10 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 28 07:44:30 2007 -0800 +++ b/ChangeLog Wed Feb 28 09:52:22 2007 -0800 @@ -1,3 +1,11 @@ +2007-02-28 15:44:30 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4192] + - there was a missing delimeter in the patch credits + + trunk/src/audacious/ui_credits.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-02-28 13:44:38 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4190] - Add support for the custom tuple field. Patch by Christian Birchinger (joker).
--- a/src/audacious/build_stamp.c Wed Feb 28 07:44:30 2007 -0800 +++ b/src/audacious/build_stamp.c Wed Feb 28 09:52:22 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070228-4190"; +const gchar *svn_stamp = "20070228-4192";
--- a/src/audacious/playback.c Wed Feb 28 07:44:30 2007 -0800 +++ b/src/audacious/playback.c Wed Feb 28 09:52:22 2007 -0800 @@ -77,7 +77,6 @@ { PlaylistEntry *entry = NULL; Playlist *playlist = playlist_get_active(); - gint penalty = 0; g_return_if_fail(playlist_get_length(playlist) != 0); @@ -90,33 +89,7 @@ entry = playlist_get_entry_to_play(playlist); g_return_if_fail(entry != NULL); - - /* - * If the playlist entry cannot be played, try to pick another one. - * If that does not work, e.g. entry == NULL, then bail. - * - * - nenolod - */ - for (penalty = 0; penalty <= 15 && entry != NULL && !playback_play_file(entry); penalty++) - { - playlist_next(playlist); - - entry = playlist_get_entry_to_play(playlist); - - /* XXX ew. workaround for a stupid bug where audacious will keep - * trying to play a file with no valid decoder. - */ - g_return_if_fail(entry != NULL); - - 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) - return; - } + playback_play_file(entry); if (playback_get_time() != -1) { equalizerwin_load_auto_preset(entry->filename);