[maemo-commits] [maemo-commits] r17156 - in projects/haf/trunk/totem-pl-parser: . plparse

[From: subversion at stage.maemo.org]

Author: ifrade
Date: 2009-01-13 15:49:27 +0200 (Tue, 13 Jan 2009)
New Revision: 17156

Modified:
   projects/haf/trunk/totem-pl-parser/ChangeLog
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-smil.c
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c
Log:
2009-01-13 Bastien Nocera <hadess at 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)

Modified: projects/haf/trunk/totem-pl-parser/ChangeLog
===================================================================
--- projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-13 13:45:22 UTC (rev 17155)
+++ projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-13 13:49:27 UTC (rev 17156)
@@ -1,3 +1,9 @@
+2009-01-13  Bastien Nocera  <hadess at 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 at hadess.net>
 
 	* plparse/totem-pl-parser-lines.c (totem_pl_parser_add_m3u):

Modified: projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-smil.c
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-smil.c	2009-01-13 13:45:22 UTC (rev 17155)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser-smil.c	2009-01-13 13:49:27 UTC (rev 17156)
@@ -61,7 +61,9 @@
 			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");

Modified: projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c	2009-01-13 13:45:22 UTC (rev 17155)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c	2009-01-13 13:49:27 UTC (rev 17156)
@@ -166,6 +166,7 @@
 	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),