diff options
| author | Bastien Nocera <hadess@hadess.net> | 2006-09-10 14:01:52 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2006-09-10 14:01:52 +0000 |
| commit | 67b22999776239dffe8b689fe03aa6e13f4e4eb4 (patch) | |
| tree | f91e89b8d120b4515232b4d78e391a5b68cbf4f3 | |
| parent | 3944591666126a4099de2b69f287eb75255eaa29 (diff) | |
| download | totem-67b22999776239dffe8b689fe03aa6e13f4e4eb4.tar.gz | |
Handle playlists linked inside playlists, as used on http://www.kinkfm.com
2006-09-10 Bastien Nocera <hadess@hadess.net>
* src/plparse/totem-pl-parser.c: (totem_pl_parser_add_m3u):
Handle playlists linked inside playlists, as used on
http://www.kinkfm.com (Closes: #354954)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/plparse/totem-pl-parser.c | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2006-09-10 Bastien Nocera <hadess@hadess.net> + * src/plparse/totem-pl-parser.c: (totem_pl_parser_add_m3u): + Handle playlists linked inside playlists, as used on + http://www.kinkfm.com (Closes: #354954) + +2006-09-10 Bastien Nocera <hadess@hadess.net> + * src/plparse/totem-pl-parser.c: (parse_asx_entries): patch from Jonathan Matthew <jonathan@kaolin.wh9.net> to handle "BASE HREF" in ASX files (Closes: #355222) diff --git a/src/plparse/totem-pl-parser.c b/src/plparse/totem-pl-parser.c index 08c96cc83..0f15d867b 100644 --- a/src/plparse/totem-pl-parser.c +++ b/src/plparse/totem-pl-parser.c @@ -1324,8 +1324,11 @@ totem_pl_parser_add_m3u (TotemPlParser *parser, const char *url, gpointer data) /* Either it's a URI, or it has a proper path ... */ if (strstr(lines[i], "://") != NULL || lines[i][0] == G_DIR_SEPARATOR) { - totem_pl_parser_add_one_url (parser, lines[i], - totem_pl_parser_get_extinfo_title (extinfo, lines, i)); + if (totem_pl_parser_parse_internal (parser, lines[i]) + != TOTEM_PL_PARSER_RESULT_SUCCESS) { + totem_pl_parser_add_one_url (parser, lines[i], + totem_pl_parser_get_extinfo_title (extinfo, lines, i)); + } extinfo = FALSE; } else if (lines[i][0] == '\\' && lines[i][1] == '\\') { /* ... Or it's in the windows smb form |