changeset 2690:62579e205746 trunk

[svn] - temporal workaround for a bug which introduced in r4360. without this patch, cuesheet plugin endlessly adds entries in a cue sheet to the current playlist.
author yaz
date Fri, 27 Apr 2007 10:22:03 -0700
parents 18e69948e8f1
children ecfb79d60c3a
files ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c
diffstat 3 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Apr 22 02:56:17 2007 -0700
+++ b/ChangeLog	Fri Apr 27 10:22:03 2007 -0700
@@ -1,3 +1,12 @@
+2007-04-22 09:56:17 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4404]
+  - update Welsh translation
+  467 strings (0 bad tokens, 0 fuzzy, 12 untranslated)
+  
+  trunk/po/cy.po |  434 ++++++++++++++++++++++++++++-----------------------------
+  1 file changed, 219 insertions(+), 215 deletions(-)
+
+
 2007-04-20 13:49:07 +0000  Ralf Ertzinger <ralf@skytale.net>
   revision [4402]
   
--- a/src/audacious/build_stamp.c	Sun Apr 22 02:56:17 2007 -0700
+++ b/src/audacious/build_stamp.c	Fri Apr 27 10:22:03 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070420-4402";
+const gchar *svn_stamp = "20070422-4404";
--- a/src/audacious/playlist.c	Sun Apr 22 02:56:17 2007 -0700
+++ b/src/audacious/playlist.c	Fri Apr 27 10:22:03 2007 -0700
@@ -706,7 +706,13 @@
 	     !str_has_prefix_nocase(filename, "https://"))
 	dec = input_check_file(filename, TRUE);
 
-    if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL) || (playlist->loading_playlist == FALSE && !is_playlist_name(filename)))
+#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))
     {
         __playlist_ins(playlist, filename, pos, dec);
         playlist_generate_shuffle_list(playlist);