diff options
author | Bastien Nocera <hadess@hadess.net> | 2009-01-13 11:34:39 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@src.gnome.org> | 2009-01-13 11:34:39 +0000 |
commit | 6815648ff76656c12e7a9d0a31c62a0e18af56b2 (patch) | |
tree | 774dbbfd60d0617c3a7ae4a268b046b5a3817cfa | |
parent | 545c1391151353444172cdc009515b0d8c34035c (diff) | |
download | totem-pl-parser-6815648ff76656c12e7a9d0a31c62a0e18af56b2.tar.gz |
Patch from Sandor Pinter to add support for WPL playlists (Closes:
2009-01-13 Bastien Nocera <hadess@hadess.net>
* plparse/totem-pl-parser-smil.c (parse_smil_entry):
* plparse/totem-pl-parser.c: Patch from Sandor Pinter
to add support for WPL playlists (Closes: #567142)
svn path=/trunk/; revision=281
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | plparse/totem-pl-parser-smil.c | 4 | ||||
-rw-r--r-- | plparse/totem-pl-parser.c | 1 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2009-01-13 Bastien Nocera <hadess@hadess.net> + + * plparse/totem-pl-parser-smil.c (parse_smil_entry): + * plparse/totem-pl-parser.c: Patch from Sandor Pinter + to add support for WPL playlists (Closes: #567142) + 2009-01-07 Bastien Nocera <hadess@hadess.net> * plparse/totem-pl-parser-lines.c (totem_pl_parser_add_m3u): diff --git a/plparse/totem-pl-parser-smil.c b/plparse/totem-pl-parser-smil.c index 3a70b7f..dc0b575 100644 --- a/plparse/totem-pl-parser-smil.c +++ b/plparse/totem-pl-parser-smil.c @@ -61,7 +61,9 @@ parse_smil_entry (TotemPlParser *parser, continue; /* ENTRY should only have one ref and one title nodes */ - if (g_ascii_strcasecmp (node->name, "video") == 0 || g_ascii_strcasecmp (node->name, "audio") == 0) { + if (g_ascii_strcasecmp (node->name, "video") == 0 + || g_ascii_strcasecmp (node->name, "audio") == 0 + || g_ascii_strcasecmp (node->name, "media") == 0) { uri = xml_parser_get_property (node, "src"); title = xml_parser_get_property (node, "title"); author = xml_parser_get_property (node, "author"); diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c index ea9669c..9c8007d 100644 --- a/plparse/totem-pl-parser.c +++ b/plparse/totem-pl-parser.c @@ -166,6 +166,7 @@ static PlaylistTypes special_types[] = { PLAYLIST_TYPE ("audio/x-scpls", totem_pl_parser_add_pls, NULL, FALSE), PLAYLIST_TYPE ("application/x-smil", totem_pl_parser_add_smil, NULL, FALSE), PLAYLIST_TYPE ("application/smil", totem_pl_parser_add_smil, NULL, FALSE), + PLAYLIST_TYPE ("application/vnd.ms-wpl", totem_pl_parser_add_smil, NULL, FALSE), PLAYLIST_TYPE ("video/x-ms-wvx", totem_pl_parser_add_asx, NULL, FALSE), PLAYLIST_TYPE ("audio/x-ms-wax", totem_pl_parser_add_asx, NULL, FALSE), PLAYLIST_TYPE ("application/xspf+xml", totem_pl_parser_add_xspf, NULL, FALSE), |