Rename totem_plparser_parse_duration to totem_pl_parser_parse_duration to

2007-09-08  Bastien Nocera  <hadess@hadess.net>

	* src/plparse/plparser.symbols:
	* src/plparse/totem-pl-parser.h:
	* src/plparse/totem-pl-parser-private.h:
	* src/plparse/totem-pl-parser.c: (totem_pl_parser_resolve_url),
	(totem_pl_parser_parse_duration): Rename
	totem_plparser_parse_duration to totem_pl_parser_parse_duration
	to match the other functions,
	Make totem_parser_resolve_url public as totem_pl_parser_resolve_url

	* src/backend/video-utils.c:
	* src/backend/video-utils.h: Remove the broken
	totem_resolve_relative_link ()

	* browser-plugin/totem-plugin-viewer.c: (on_got_redirect),
	(entry_parsed):
	* src/plparse/test-parser.c: (test_resolve_real), (test_resolve),
	(test_duration_real), (main):
	* src/plparse/totem-pl-parser-pls.c:
	(totem_pl_parser_add_pls_with_contents):
	* src/plparse/totem-pl-parser-smil.c: (parse_smil_entry):
	* src/plparse/totem-pl-parser-wm.c: (parse_asx_entry),
	(parse_asx_entryref):
	* src/plparse/totem-pl-parser-xspf.c: (parse_xspf_track):
	* src/totem-playlist.c: (totem_playlist_entry_parsed):
	* src/totem.c: (on_got_redirect):
	Changes to use new APIs
	Add test from the Apple site to the test parser

	(Closes: #474842)


svn path=/trunk/; revision=4683

1 files changed, 5 insertions, 5 deletions

diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 439bedfc4..d3c7279a8 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -1364,13 +1364,13 @@ on_got_redirect (GtkWidget *bvw, const char *mrl, TotemEmbedded *emb)
 
 	/* We are using a local cache, so we resolve against the stream_uri */
 	if (emb->stream_uri)
-		new_uri = totem_resolve_relative_link (emb->stream_uri, mrl);
+		new_uri = totem_pl_parser_resolve_url (emb->stream_uri, mrl);
 	/* We don't have a local cache, so resolve against the URI */
 	else if (emb->current_uri)
-		new_uri = totem_resolve_relative_link (emb->current_uri, mrl);
+		new_uri = totem_pl_parser_resolve_url (emb->current_uri, mrl);
 	/* FIXME: not sure that this is actually correct... */
 	else if (emb->base_uri)
-		new_uri = totem_resolve_relative_link (emb->base_uri, mrl);
+		new_uri = totem_pl_parser_resolve_url (emb->base_uri, mrl);
 
 	if (!new_uri)
 		return;
@@ -2063,8 +2063,8 @@ entry_parsed (TotemPlParser *parser,
 
 	item = g_new0 (TotemPlItem, 1);
 	item->uri = g_strdup (uri);
-	item->duration = totem_plparser_parse_duration (g_hash_table_lookup (metadata, "duration"), FALSE);
-	item->starttime = totem_plparser_parse_duration (g_hash_table_lookup (metadata, "starttime"), FALSE);
+	item->duration = totem_pl_parser_parse_duration (g_hash_table_lookup (metadata, "duration"), FALSE);
+	item->starttime = totem_pl_parser_parse_duration (g_hash_table_lookup (metadata, "starttime"), FALSE);
 
 	emb->playlist = g_list_prepend (emb->playlist, item);
 }