# HG changeset patch
# User nenolod
# Date 1176664985 25200
# Node ID 25bc2010e9f0c6e36dc73db9e800ff631cc48679
# Parent  34325e9fcc60690d1824f5cb6fca9bd211c1cb7b
[svn] - merge some local changes which makes curl threading more reliable.

diff -r 34325e9fcc60 -r 25bc2010e9f0 ChangeLog
--- a/ChangeLog	Sun Apr 15 11:33:11 2007 -0700
+++ b/ChangeLog	Sun Apr 15 12:23:05 2007 -0700
@@ -1,3 +1,10 @@
+2007-04-15 18:33:11 +0000  Giacomo Lozito <james@develia.org>
+  revision [2060]
+  - alsa: on volume changes, only use channel switches if the audio card supports separated ones
+  trunk/src/alsa/audio.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-04-15 05:08:50 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2058]
   bug fix for #897
diff -r 34325e9fcc60 -r 25bc2010e9f0 src/curl/curl.c
--- a/src/curl/curl.c	Sun Apr 15 11:33:11 2007 -0700
+++ b/src/curl/curl.c	Sun Apr 15 12:23:05 2007 -0700
@@ -36,12 +36,12 @@
 #define DEBUG_OPEN_CLOSE 1
 #define DEBUG_SEEK 0
 #define DEBUG_READ 0
-#define DEBUG_HEADERS 0
+#define DEBUG_HEADERS 1
 #define DEBUG_ICY 0
 #define DEBUG_ICY_WRAP 0
 #define DEBUG_ICY_VERBOSE 0
 #define DEBUG_METADATA_REPORT 0
-#define DEBUG_CURL 1
+#define DEBUG_CURL 0
 
 typedef struct _CurlHandle CurlHandle;
 
@@ -201,7 +201,7 @@
   if (strlen(header) > size)
     return FALSE;
   // XXXX wrapped headers
-  return !(strncmp(handle->buffer + handle->hdr_index,
+  return !(strncasecmp(handle->buffer + handle->hdr_index,
 		   header, strlen(header)));
 }
 
@@ -503,6 +503,7 @@
   handle->cancel = 1;
 
   g_cond_signal(handle->curl_cond);
+  handle->thread = NULL;
 
   return NULL;
 }
@@ -525,7 +526,9 @@
       handle->thread = g_thread_create(curl_manage_request, handle, 
 				       TRUE, NULL);
 
+      g_mutex_lock(handle->curl_mutex);
       g_cond_wait(handle->curl_cond, handle->curl_mutex);
+      g_mutex_unlock(handle->curl_mutex);
     }
 }