Mercurial > audlegacy

diff audacious/playlist.c @ 1163:ff71f891265b trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - Allow to do format detection on demand; instead of immediately on add
author nenolod
date Sat, 10 Jun 2006 21:02:24 -0700
parents 1a73946ddfbd
children 6fe822f5a3c0
line wrap: on
line diff
--- a/audacious/playlist.c	Sat Jun 10 18:47:51 2006 -0700
+++ b/audacious/playlist.c	Sat Jun 10 21:02:24 2006 -0700
@@ -508,12 +508,12 @@
         return TRUE;
     }
 
-    if (loading_playlist == TRUE)
+    if (loading_playlist == TRUE || cfg.playlist_detect == FALSE)
 	dec = NULL;
     else
 	dec = input_check_file(filename, TRUE);
 
-    if (loading_playlist == TRUE || (loading_playlist == FALSE && dec != NULL))
+    if (cfg.playlist_detect == FALSE || loading_playlist == TRUE || (loading_playlist == FALSE && dec != NULL))
     {
 	__playlist_ins(filename, pos, dec);
 	playlist_generate_shuffle_list();
@@ -1375,7 +1375,7 @@
         if ((tmp = strrchr(path, '/')))
             *tmp = '\0';
         else {
-	    if (loading_playlist != TRUE)
+	    if (loading_playlist != TRUE || cfg.playlist_detect == FALSE)
 	        dec = input_check_file(filename, FALSE);
 	    else
 		dec = NULL;
@@ -1385,7 +1385,7 @@
         }
         tmp = g_build_filename(path, filename, NULL);
 
-	if (loading_playlist != TRUE)
+	if (loading_playlist != TRUE || cfg.playlist_detect == FALSE)
 	    dec = input_check_file(tmp, FALSE);
 	else
 	    dec = NULL;
@@ -1396,7 +1396,7 @@
     }
     else
     {
-	if (loading_playlist != TRUE)
+	if (loading_playlist != TRUE || cfg.playlist_detect == FALSE)
 	    dec = input_check_file(filename, FALSE);
 	else
 	    dec = NULL;