Mercurial > audlegacy
changeset 1277:8c8d4841efae trunk
[svn] - if entry->tuple == NULL, then probe the file for a decoder and build the appropriate tuple for that entry
| author | nenolod |
|---|---|
| date | Fri, 16 Jun 2006 03:50:38 -0700 |
| parents | e43225462cdc |
| children | 7baea4fb20a4 |
| files | ChangeLog audacious/playlist.c |
| diffstat | 2 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 16 02:58:33 2006 -0700 +++ b/ChangeLog Fri Jun 16 03:50:38 2006 -0700 @@ -1,3 +1,12 @@ +2006-06-16 09:58:33 +0000 George Averill <nhjm449@gmail.com> + revision [1466] + - Buffer indicator support for anyone crazy enough to stream flac. + + + Changes: Modified: + +6 -0 trunk/Plugins/Input/flac/http.c + + 2006-06-16 09:35:49 +0000 William Pitcock <nenolod@nenolod.net> revision [1464] - use mutex locking to make alsa stay happy with dmix
--- a/audacious/playlist.c Fri Jun 16 02:58:33 2006 -0700 +++ b/audacious/playlist.c Fri Jun 16 03:50:38 2006 -0700 @@ -185,6 +185,9 @@ g_return_val_if_fail(entry != NULL, FALSE); + if (entry->decoder == NULL) + entry->decoder = input_check_file(entry->filename, FALSE); + if (entry->decoder == NULL || entry->decoder->get_song_tuple == NULL) tuple = input_get_song_tuple(entry->filename); else @@ -2130,6 +2133,14 @@ } PLAYLIST_UNLOCK(); + + /* No tuple? Try to set this entry up properly. --nenolod */ + if (entry->tuple == NULL) + { + playlist_entry_get_info(entry); + tuple = entry->tuple; + } + if (tuple != NULL) { if (entry->decoder != NULL && entry->decoder->file_info_box == NULL)