Mercurial > audlegacy
changeset 2701:906caaf4737d trunk
[svn] - fix cuesheet bug in a better way (e.g. unbreak http:// streams)
| author | nenolod |
|---|---|
| date | Sun, 06 May 2007 15:16:34 -0700 |
| parents | 2d1837805ca4 |
| children | 89155edffa31 |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c |
| diffstat | 3 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 05 16:50:36 2007 -0700 +++ b/ChangeLog Sun May 06 15:16:34 2007 -0700 @@ -1,3 +1,13 @@ +2007-05-05 23:50:36 +0000 Ben Tucker <bnt@interchange.ubc.ca> + revision [4426] + Improved DBus initialization and fixed a warning. + + trunk/src/audacious/dbus.c | 6 ++---- + trunk/src/audacious/dbus.h | 2 +- + trunk/src/audacious/main.c | 2 +- + 3 files changed, 4 insertions(+), 6 deletions(-) + + 2007-05-05 23:37:04 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4424] - update manpage for autoconf 2.60
--- a/src/audacious/build_stamp.c Sat May 05 16:50:36 2007 -0700 +++ b/src/audacious/build_stamp.c Sun May 06 15:16:34 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070505-4424"; +const gchar *svn_stamp = "20070505-4426";
--- a/src/audacious/playlist.c Sat May 05 16:50:36 2007 -0700 +++ b/src/audacious/playlist.c Sun May 06 15:16:34 2007 -0700 @@ -706,13 +706,10 @@ !str_has_prefix_nocase(filename, "https://")) dec = input_check_file(filename, TRUE); -#if 0 printf("loading_playlist = %d filename = %s is_playlist_name = %d\n", playlist->loading_playlist, filename, playlist->loading_playlist); -#endif - /* XXX this line causes cuesheet plugin infinite addition to the playlist. --yaz */ -// if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL) || (playlist->loading_playlist == FALSE && !is_playlist_name(filename))) - if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL)) + + if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL) || (playlist->loading_playlist == FALSE && !is_playlist_name(filename) && str_has_prefix_nocase(filename, "http"))) { __playlist_ins(playlist, filename, pos, dec); playlist_generate_shuffle_list(playlist);