rpms/streamtuner/devel streamtuner-0.99.99-shoutcast.patch, NONE, 1.1

[Matthias Haase]

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2716

Added Files:
	streamtuner-0.99.99-shoutcast.patch 
Log Message:
The patch changes shoutcast-base-url for shoutcast to classic.shoutcast

streamtuner-0.99.99-shoutcast.patch:

--- NEW FILE streamtuner-0.99.99-shoutcast.patch ---
diff -Naur streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
--- streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
+++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2008-09-16 17:24:51.680247169 +0200
@@ -37,7 +37,7 @@
 
 /*** cpp *********************************************************************/
 
-#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
+#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
 
 #define MAX_STREAMS_PER_PAGE	100 /* enforced by SHOUTcast */
 
@@ -94,6 +94,8 @@
 
   GNode			*parent_node;
   SHOUTcastStream	*stream;
+  
+  int parse_genres;
 } ReloadInfo;
 
 /*** variable declarations ***************************************************/
@@ -518,6 +520,7 @@
       info.npages = 0;
       info.parent_node = NULL;
       info.stream = NULL;
+      info.parse_genres = 0;
 
       status = st_transfer_session_get_by_line(session,
 					       url,
@@ -565,10 +568,16 @@
       info->stream = stream_new_cb(NULL);
       info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1);
     }
-  else if (info->page < 2
-	   && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\""))
-		|| (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\"")))
-	       && (s2 = strstr(s1, "\">"))))
+  else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">")))
+  {
+  	info->parse_genres = 1;
+  }
+  else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>")))
+  {
+  	info->parse_genres = 0;
+  }
+  else if (info->page < 2 && info->parse_genres == 1
+	   && ((s1 = st_strstr_span(line, "<OPTION VALUE=\""))  && (s2 = strstr(s1, "\">"))))
     {
       STCategory *category;
       GNode *node;