Mercurial > audlegacy

changeset 2667:8c56926de2ad trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
author nenolod
date Tue, 10 Apr 2007 10:17:48 -0700
parents 78a8b3095274
children d5da5d37ec8b
files ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c
diffstat 3 files changed, 46 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 10 09:45:30 2007 -0700
+++ b/ChangeLog	Tue Apr 10 10:17:48 2007 -0700
@@ -1,3 +1,11 @@
+2007-04-10 16:45:30 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4358]
+  - do not use the signal handler at all on linuxthreads and hope for the best
+  
+  trunk/src/audacious/signals.c |   39 +++++++++++++++++++++++++++++++++------
+  1 file changed, 33 insertions(+), 6 deletions(-)
+
+
 2007-04-10 15:42:11 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4356]
   - include missing header
--- a/src/audacious/build_stamp.c	Tue Apr 10 09:45:30 2007 -0700
+++ b/src/audacious/build_stamp.c	Tue Apr 10 10:17:48 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070410-4356";
+const gchar *svn_stamp = "20070410-4358";
--- a/src/audacious/playlist.c	Tue Apr 10 09:45:30 2007 -0700
+++ b/src/audacious/playlist.c	Tue Apr 10 10:17:48 2007 -0700
@@ -193,7 +193,9 @@
     g_return_val_if_fail(entry != NULL, FALSE);
 
     // Let's not randomly probe streams, mmkay?
-    if (entry->decoder == NULL && (str_has_prefix_nocase(entry->filename, "http://") || str_has_prefix_nocase(entry->filename, "https://")))
+    if (entry->decoder == NULL && 
+	(str_has_prefix_nocase(entry->filename, "http://") || 
+	 str_has_prefix_nocase(entry->filename, "https://")))
         return TRUE;
 
     if (entry->tuple == NULL || entry->tuple->mtime > 0 || entry->tuple->mtime == -1)
@@ -686,7 +688,7 @@
     gchar buf[64], *p;
     gint r;
     VFSFile *file;
-    InputPlugin *dec;
+    InputPlugin *dec = NULL;
 
     g_return_val_if_fail(playlist != NULL, FALSE);
     g_return_val_if_fail(filename != NULL, FALSE);
@@ -700,10 +702,11 @@
 
     if (playlist->loading_playlist == TRUE || cfg.playlist_detect == TRUE)
 	dec = NULL;
-    else
+    else if (!str_has_prefix_nocase(filename, "http://") && 
+	     !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))
+    if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL) || (playlist->loading_playlist == FALSE && !is_playlist_name(filename)))
     {
         __playlist_ins(playlist, filename, pos, dec);
         playlist_generate_shuffle_list(playlist);
@@ -1638,7 +1641,7 @@
 {
     gchar *filename;
     gchar *tmp, *path;
-    InputPlugin *dec;		/* for decoder cache */
+    InputPlugin *dec = NULL;		/* for decoder cache */
 
     g_return_if_fail(filename_p != NULL);
     g_return_if_fail(playlist != NULL);
@@ -1655,10 +1658,12 @@
         if ((tmp = strrchr(path, '/')))
             *tmp = '\0';
         else {
-	    if (playlist->loading_playlist != TRUE || cfg.playlist_detect == FALSE)
-	        dec = input_check_file(filename, FALSE);
-	    else
-		dec = NULL;
+	    if ((playlist->loading_playlist == TRUE ||
+		cfg.playlist_detect == TRUE))
+                dec = NULL;
+	    else if (!str_has_prefix_nocase(filename, "http://") && 
+	        !str_has_prefix_nocase(filename, "https://"))
+		dec = input_check_file(filename, FALSE);
 
             __playlist_ins_with_info(playlist, filename, pos, title, len, dec);
             return;
@@ -1676,10 +1681,12 @@
     }
     else
     {
-	if (playlist->loading_playlist != TRUE && cfg.playlist_detect != TRUE)
+        if ((playlist->loading_playlist == TRUE ||
+  	    cfg.playlist_detect == TRUE))
+            dec = NULL;
+	else if (!str_has_prefix_nocase(filename, "http://") && 
+	    !str_has_prefix_nocase(filename, "https://"))
 	    dec = input_check_file(filename, FALSE);
-	else
-	    dec = NULL;
 
         __playlist_ins_with_info(playlist, filename, pos, title, len, dec);
     }
@@ -1696,7 +1703,7 @@
 {
     gchar *filename;
     gchar *tmp, *path;
-    InputPlugin *dec;		/* for decoder cache */
+    InputPlugin *dec = NULL;		/* for decoder cache */
 
     g_return_if_fail(filename_p != NULL);
     g_return_if_fail(playlist_name != NULL);
@@ -1712,20 +1719,24 @@
         if ((tmp = strrchr(path, '/')))
             *tmp = '\0';
         else {
-	    if (playlist->loading_playlist != TRUE || cfg.playlist_detect == FALSE)
+            if ((playlist->loading_playlist == TRUE ||
+    	        cfg.playlist_detect == TRUE))
+                dec = NULL;
+	    else if (!str_has_prefix_nocase(filename, "http://") && 
+	        !str_has_prefix_nocase(filename, "https://"))
 	        dec = input_check_file(filename, FALSE);
-	    else
-		dec = NULL;
 
             __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, dec);
             return;
         }
         tmp = g_build_filename(path, filename, NULL);
 
-	if (playlist->loading_playlist != TRUE && cfg.playlist_detect != TRUE)
-	    dec = input_check_file(tmp, FALSE);
-	else
-	    dec = NULL;
+        if ((playlist->loading_playlist == TRUE ||
+            cfg.playlist_detect == TRUE))
+            dec = NULL;
+        else if (!str_has_prefix_nocase(filename, "http://") && 
+            !str_has_prefix_nocase(filename, "https://"))
+            dec = input_check_file(filename, FALSE);
 
         __playlist_ins_with_info_tuple(playlist, tmp, pos, tuple, dec);
         g_free(tmp);
@@ -1733,10 +1744,12 @@
     }
     else
     {
-	if (playlist->loading_playlist != TRUE && cfg.playlist_detect != TRUE)
-	    dec = input_check_file(filename, FALSE);
-	else
-	    dec = NULL;
+        if ((playlist->loading_playlist == TRUE ||
+            cfg.playlist_detect == TRUE))
+            dec = NULL;
+        else if (!str_has_prefix_nocase(filename, "http://") && 
+            !str_has_prefix_nocase(filename, "https://"))
+            dec = input_check_file(filename, FALSE);
 
         __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, dec);
     }