diff -rupN streamtuner-0.99.99/src/plugins/live365/live365.c streamtuner-0.99.99-new/src/plugins/live365/live365.c --- streamtuner-0.99.99/src/plugins/live365/live365.c 2004-12-19 11:27:03.000000000 +0100 +++ streamtuner-0.99.99-new/src/plugins/live365/live365.c 2009-11-25 20:46:03.906432214 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, 2004 Jean-Yves Lefort + * Copyright (C) 2002-2005 Jean-Yves Lefort * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,7 +59,9 @@ typedef enum { ACCESS_ALL, ACCESS_VIP, - ACCESS_SUBSCRIPTION + ACCESS_SUBSCRIPTION, + ACCESS_SOLD_OUT, + ACCESS_UNKNOWN } Access; typedef struct @@ -94,7 +96,8 @@ typedef struct { GList **streams; Live365Stream *stream; - Live365Stream *finished_stream; + gboolean first_page; + gboolean looped; gboolean has_next_page; } ReloadStreamsInfo; @@ -263,13 +266,16 @@ stream_field_get_cb (Live365Stream *stre case FIELD_ACCESS_STRING: { - const char *str = NULL; + const char *str; switch (stream->access) { case ACCESS_ALL: str = _("All"); break; case ACCESS_VIP: str = _("VIP"); break; case ACCESS_SUBSCRIPTION: str = _("Subscription"); break; + case ACCESS_SOLD_OUT: str = _("Sold out"); break; + case ACCESS_UNKNOWN: str = _("Unknown"); break; + default: str = NULL; break; } g_value_set_string(value, str); @@ -707,14 +713,16 @@ reload_categories_body_cb (const char *l char *s1, *s2, *s3, *s4, *s5; if ((s1 = st_strstr_span(line, "')) && (s5 = strstr(s4, ""))) { category = st_category_new(); category->name = g_strndup(s2, s3 - s2); - category->label = st_sgml_ref_expand_len(s4, s5 - s4); + category->label = ! strcmp(category->name, "Recommendations") + ? g_strdup(_("Recommendations")) + : st_sgml_ref_expand_len(s4, s5 - s4); category->url_postfix = g_strconcat(DIRECTORY_PREFIX, category->name, NULL); } else if ((s1 = st_strstr_span(line, "looped) + return; + if ((s1 = st_str_has_prefix_span(line, "stream->access = ACCESS_VIP; else if (strstr(s2, "'SUBSCRIPTION'")) info->stream->access = ACCESS_SUBSCRIPTION; + else if (strstr(s2, "'SOLD_OUT'")) + info->stream->access = ACCESS_SOLD_OUT; else - PARSE_ERROR; - - info->finished_stream = NULL; + { + PARSE_ERROR; + info->stream->access = ACCESS_UNKNOWN; + } } else if ((s1 = st_str_has_prefix_span(line, "")) - && (s4 = strstr(s3, ""))) + && (s2 = st_strstr_span(s1, "href='")) + && (s3 = strstr(s2, "'>")) + && (s4 = strstr(s3, ""))) { if (info->stream) { @@ -865,12 +884,19 @@ reload_streams_body_cb (const char *line else PARSE_ERROR; } - else if ((s1 = st_strstr_span(line, "&station_id=")) - && (s2 = strchr(s1, '&'))) + else if ((s1 = st_str_has_prefix_span(line, "')) - && (s3 = strstr(s2, ""))) - { - if (info->stream) - { - g_free(info->stream->broadcaster); - info->stream->broadcaster = st_sgml_ref_expand_len(s2, s3 - s2); - } - else - PARSE_ERROR; - } else if ((s1 = st_str_has_prefix_span(line, "')) - && (s3 = strstr(s2, "
")) - && ((s4 = strstr(s3, "stream) { word1 = st_sgml_ref_expand_len(s2, s3 - s2); - s3 += 4; word2 = st_sgml_ref_expand_len(s3, s4 - s3); - + g_free(info->stream->audio); - info->stream->audio = g_strdup_printf(g_str_has_prefix(s4, "") ? "%s %s" : "%s %s, MP3Pro", word2, word1); - g_free(word1); - g_free(word2); + if (strstr(s3, "')) + && (s4 = strstr(s3, "
"))) + info->stream->description = st_sgml_ref_expand_len(s3, s4 - s3); + ((STStream *) info->stream)->name = g_strdup_printf("%i", info->stream->station_id); *(info->streams) = g_list_append(*(info->streams), info->stream); } @@ -962,23 +982,23 @@ reload_streams_body_cb (const char *line stream_free_cb(info->stream, NULL); } - info->finished_stream = info->stream; info->stream = NULL; } else PARSE_ERROR; } - else if ((s1 = st_strstr_span(line, "')) - && (s3 = strstr(s2, "
"))) + else if ((s1 = st_strstr_span(line, "Showing ")) + && (s3 = strchr(s2, '-'))) { - if (info->finished_stream) + word1 = g_strndup(s2, s3 - s2); + if (st_str_like(word1, ST_NUMERIC)) { - info->finished_stream->description = st_sgml_ref_expand_len(s2, s3 - s2); - info->finished_stream = NULL; + int n = atoi(word1); + if (n == 1 && ! info->first_page) + info->looped = TRUE; } - else - PARSE_ERROR; + g_free(word1); } else if (strstr(line, "Next
")) info->has_next_page = TRUE; @@ -1410,8 +1430,8 @@ plugin_init (GError **err) init_handler(); st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q"); - st_action_register("view-web", _("Open a web page"), "epiphany %q"); - st_action_register("play-stream", _("Listen to a stream"), "xmms %q"); + st_action_register("view-web", _("Open a web page"), "firefox %q"); + st_action_register("play-stream", _("Listen to a stream"), "audacious %q"); return TRUE; } diff -rupN streamtuner-0.99.99/src/plugins/local/local.c streamtuner-0.99.99-new/src/plugins/local/local.c --- streamtuner-0.99.99/src/plugins/local/local.c 2004-12-13 08:39:29.000000000 +0100 +++ streamtuner-0.99.99-new/src/plugins/local/local.c 2009-11-25 20:46:33.310457862 +0100 @@ -1057,8 +1057,8 @@ plugin_init (GError **err) init_handler(); - st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q"); - st_action_register("view-web", _("Open a web page"), "epiphany %q"); + st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q"); + st_action_register("view-web", _("Open a web page"), "firefox %q"); return TRUE; } diff -rupN streamtuner-0.99.99/src/plugins/python/google-stations.py streamtuner-0.99.99-new/src/plugins/python/google-stations.py --- streamtuner-0.99.99/src/plugins/python/google-stations.py 2004-12-18 09:29:30.000000000 +0100 +++ streamtuner-0.99.99-new/src/plugins/python/google-stations.py 2009-11-25 20:46:59.610865740 +0100 @@ -166,7 +166,7 @@ def init (): if not ST.check_api_version(2, 0): raise RuntimeError, _("API version mismatch") - ST.action_register("view-web", _("Open a web page"), "epiphany %q") + ST.action_register("view-web", _("Open a web page"), "firefox %q") handler = GoogleStationsHandler() ST.handlers_add(handler) diff -rupN streamtuner-0.99.99/src/plugins/python/pst-main.c streamtuner-0.99.99-new/src/plugins/python/pst-main.c --- streamtuner-0.99.99/src/plugins/python/pst-main.c 2004-12-11 03:00:39.000000000 +0100 +++ streamtuner-0.99.99-new/src/plugins/python/pst-main.c 2009-11-25 20:24:35.000000000 +0100 @@ -94,6 +94,7 @@ plugin_init (GError **err) { gboolean status = FALSE; PyObject *module; + char *argv[] = { "" }; if (! check_api_version(err)) return FALSE; @@ -109,6 +110,7 @@ plugin_init (GError **err) } Py_Initialize(); + PySys_SetArgv(G_N_ELEMENTS(argv), argv); PyEval_InitThreads(); module = PyImport_AddModule("__main__"); diff -rupN streamtuner-0.99.99/src/plugins/python/punkcast.com.py streamtuner-0.99.99-new/src/plugins/python/punkcast.com.py --- streamtuner-0.99.99/src/plugins/python/punkcast.com.py 2004-12-13 06:45:14.000000000 +0100 +++ streamtuner-0.99.99-new/src/plugins/python/punkcast.com.py 2009-11-25 20:47:19.389076789 +0100 @@ -192,7 +192,7 @@ def init (): if not ST.check_api_version(2, 0): raise RuntimeError, _("API version mismatch") - ST.action_register("view-web", _("Open a web page"), "epiphany %q") + ST.action_register("view-web", _("Open a web page"), "firefox %q") handler = PunkcastComHandler() ST.handlers_add(handler) diff -rupN streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99-new/src/plugins/shoutcast/shoutcast.c --- streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c 2004-12-19 16:21:00.000000000 +0100 +++ streamtuner-0.99.99-new/src/plugins/shoutcast/shoutcast.c 2009-11-25 20:48:51.258619782 +0100 @@ -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 */ @@ -91,6 +91,7 @@ typedef struct int page; int npages; + int parse_genres; GNode *parent_node; SHOUTcastStream *stream; @@ -516,6 +517,7 @@ reload_cb (STCategory *category, info.page = 0; info.npages = 0; + info.parse_genres = 0; info.parent_node = NULL; info.stream = NULL; @@ -566,9 +568,18 @@ reload_body_cb (const char *line, gpoint 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