diff -Nru totem-pl-parser-2.26.1/debian/changelog totem-pl-parser-2.26.2/debian/changelog --- totem-pl-parser-2.26.1/debian/changelog 2009-05-06 18:06:18.000000000 +1000 +++ totem-pl-parser-2.26.2/debian/changelog 2009-05-06 18:01:53.000000000 +1000 @@ -1,3 +1,13 @@ +totem-pl-parser (2.26.2-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #372602) + - Fix video/mp4 files played from YouTube showing "get_video" as the video + name (LP: #346661) + * debian/patches/20_handle_playlist_newlines.patch + - Handle various newline formats in playlists (LP: #181553) + + -- Robert Ancell Wed, 06 May 2009 17:45:59 +1000 + totem-pl-parser (2.26.1-0ubuntu1) jaunty; urgency=low * New upstream release (LP: #353412) diff -Nru totem-pl-parser-2.26.1/debian/control totem-pl-parser-2.26.2/debian/control --- totem-pl-parser-2.26.1/debian/control 2009-05-06 18:06:18.000000000 +1000 +++ totem-pl-parser-2.26.2/debian/control 2009-05-06 18:05:13.000000000 +1000 @@ -14,7 +14,7 @@ libdbus-1-dev (>= 0.61), libcamel1.2-dev (>= 2.24.1), gtk-doc-tools (>= 1.11) -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort +Uploaders: Debian GNOME Maintainers Standards-Version: 3.7.3 Section: libs diff -Nru totem-pl-parser-2.26.1/debian/patches/20_handle_playlist_newlines.patch totem-pl-parser-2.26.2/debian/patches/20_handle_playlist_newlines.patch --- totem-pl-parser-2.26.1/debian/patches/20_handle_playlist_newlines.patch 1970-01-01 10:00:00.000000000 +1000 +++ totem-pl-parser-2.26.2/debian/patches/20_handle_playlist_newlines.patch 2009-05-06 17:57:30.000000000 +1000 @@ -0,0 +1,325 @@ +diff -Nur -x '*.orig' -x '*~' totem-pl-parser-2.26.2/plparse/totem-pl-parser.c totem-pl-parser-2.26.2.new/plparse/totem-pl-parser.c +--- totem-pl-parser-2.26.2/plparse/totem-pl-parser.c 2009-04-24 23:04:44.000000000 +1000 ++++ totem-pl-parser-2.26.2.new/plparse/totem-pl-parser.c 2009-05-06 17:55:30.000000000 +1000 +@@ -1148,7 +1148,6 @@ + * totem_pl_parser_read_ini_line_string_with_sep: + * @lines: a NULL-terminated array of INI lines to read + * @key: the key to match +- * @dos_mode: %TRUE if the returned string should end in \r\0, instead of \n\0 + * @sep: the key-value separator + * + * Returns the first string value case-insensitively matching the specified +@@ -1159,7 +1158,7 @@ + **/ + char* + totem_pl_parser_read_ini_line_string_with_sep (char **lines, const char *key, +- gboolean dos_mode, const char *sep) ++ const char *sep) + { + char *retval = NULL; + int i; +@@ -1175,7 +1174,6 @@ + + if (g_ascii_strncasecmp (line, key, strlen (key)) == 0) { + char **bits; +- glong len; + + bits = g_strsplit (line, sep, 2); + if (bits[0] == NULL || bits [1] == NULL) { +@@ -1184,12 +1182,6 @@ + } + + retval = g_strdup (bits[1]); +- len = strlen (retval); +- if (dos_mode && len >= 2 && retval[len-2] == '\r') { +- retval[len-2] = '\n'; +- retval[len-1] = '\0'; +- } +- + g_strfreev (bits); + } + } +@@ -1201,7 +1193,6 @@ + * totem_pl_parser_read_ini_line_string: + * @lines: a NULL-terminated array of INI lines to read + * @key: the key to match +- * @dos_mode: %TRUE if the returned string should end in \r\0, instead of \n\0 + * + * Returns the first string value case-insensitively matching the + * specified key. The parser ignores leading whitespace on lines. +@@ -1209,9 +1200,9 @@ + * Return value: a newly-allocated string value, or %NULL + **/ + char* +-totem_pl_parser_read_ini_line_string (char **lines, const char *key, gboolean dos_mode) ++totem_pl_parser_read_ini_line_string (char **lines, const char *key) + { +- return totem_pl_parser_read_ini_line_string_with_sep (lines, key, dos_mode, "="); ++ return totem_pl_parser_read_ini_line_string_with_sep (lines, key, "="); + } + + static void +diff -Nur -x '*.orig' -x '*~' totem-pl-parser-2.26.2/plparse/totem-pl-parser-lines.c totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-lines.c +--- totem-pl-parser-2.26.2/plparse/totem-pl-parser-lines.c 2009-04-18 00:09:54.000000000 +1000 ++++ totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-lines.c 2009-05-06 17:57:18.000000000 +1000 +@@ -250,18 +250,11 @@ + char *contents, **lines; + gsize size; + guint i; +- const char *split_char; + + if (g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) == FALSE) + return TOTEM_PL_PARSER_RESULT_ERROR; + +- /* figure out whether we're a unix or dos RAM file */ +- if (strstr(contents,"\x0d") == NULL) +- split_char = "\n"; +- else +- split_char = "\x0d\n"; +- +- lines = g_strsplit (contents, split_char, 0); ++ lines = g_strsplit_set (contents, "\r\n", 0); + g_free (contents); + + for (i = 0; lines[i] != NULL; i++) { +@@ -351,8 +344,8 @@ + char *contents, **lines; + gsize size; + guint i, num_lines; +- gboolean dos; +- const char *split_char, *extinfo; ++ gboolean dos_mode = FALSE; ++ const char *extinfo; + + if (g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) == FALSE) + return TOTEM_PL_PARSER_RESULT_ERROR; +@@ -381,15 +374,11 @@ + extinfo = NULL; + + /* figure out whether we're a unix m3u or dos m3u */ +- if (strstr(contents,"\x0d") == NULL) { +- split_char = "\n"; +- dos = FALSE; +- } else { +- split_char = "\x0d\n"; +- dos = TRUE; ++ if (strstr(contents, "\x0d")) { ++ dos_mode = TRUE; + } + +- lines = g_strsplit (contents, split_char, 0); ++ lines = g_strsplit_set (contents, "\r\n", 0); + g_free (contents); + num_lines = g_strv_length (lines); + /* We don't count the terminating NULL */ +@@ -408,11 +397,6 @@ + continue; + } + +- /* If we're on the last line, and we're a DOS M3U, +- * remove the terminating \n if it's there */ +- if (dos != FALSE && i == num_lines) +- g_strchomp (lines[i]); +- + /* Either it's a URI, or it has a proper path ... */ + if (strstr(lines[i], "://") != NULL + || lines[i][0] == G_DIR_SEPARATOR) { +@@ -459,7 +443,7 @@ + char sep; + + _base_file = g_file_get_parent (file); +- sep = (split_char[0] == '\n' ? '/' : '\\'); ++ sep = (dos_mode ? '\\' : '/'); + if (sep == '\\') + lines[i] = g_strdelimit (lines[i], "\\", '/'); + uri = g_file_get_child (_base_file, lines[i]); +diff -Nur -x '*.orig' -x '*~' totem-pl-parser-2.26.2/plparse/totem-pl-parser-misc.c totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-misc.c +--- totem-pl-parser-2.26.2/plparse/totem-pl-parser-misc.c 2009-04-18 00:09:54.000000000 +1000 ++++ totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-misc.c 2009-05-06 17:56:52.000000000 +1000 +@@ -59,7 +59,7 @@ + g_free (contents); + + /* We only handle GVP version 1.1 for now */ +- version = totem_pl_parser_read_ini_line_string_with_sep (lines, "gvp_version", FALSE, ":"); ++ version = totem_pl_parser_read_ini_line_string_with_sep (lines, "gvp_version", ":"); + if (version == NULL || strcmp (version, "1.1") != 0) { + g_free (version); + g_strfreev (lines); +@@ -67,7 +67,7 @@ + } + g_free (version); + +- link = totem_pl_parser_read_ini_line_string_with_sep (lines, "url", FALSE, ":"); ++ link = totem_pl_parser_read_ini_line_string_with_sep (lines, "url", ":"); + if (link == NULL) { + g_strfreev (lines); + return retval; +@@ -75,7 +75,7 @@ + + retval = TOTEM_PL_PARSER_RESULT_SUCCESS; + +- title = totem_pl_parser_read_ini_line_string_with_sep (lines, "title", FALSE, ":"); ++ title = totem_pl_parser_read_ini_line_string_with_sep (lines, "title", ":"); + + totem_pl_parser_add_one_uri (parser, link, title); + +@@ -104,7 +104,7 @@ + lines = g_strsplit (contents, "\n", 0); + g_free (contents); + +- type = totem_pl_parser_read_ini_line_string (lines, "Type", FALSE); ++ type = totem_pl_parser_read_ini_line_string (lines, "Type"); + if (type == NULL) + goto bail; + +@@ -113,12 +113,12 @@ + goto bail; + } + +- path = totem_pl_parser_read_ini_line_string (lines, "URL", FALSE); ++ path = totem_pl_parser_read_ini_line_string (lines, "URL"); + if (path == NULL) + goto bail; + target = g_file_new_for_uri (path); + +- display_name = totem_pl_parser_read_ini_line_string (lines, "Name", FALSE); ++ display_name = totem_pl_parser_read_ini_line_string (lines, "Name"); + + if (totem_pl_parser_ignore (parser, path) == FALSE + && g_ascii_strcasecmp (type, "FSDevice") != 0) { +diff -Nur -x '*.orig' -x '*~' totem-pl-parser-2.26.2/plparse/totem-pl-parser-pls.c totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-pls.c +--- totem-pl-parser-2.26.2/plparse/totem-pl-parser-pls.c 2009-04-18 00:09:54.000000000 +1000 ++++ totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-pls.c 2009-05-06 17:56:35.000000000 +1000 +@@ -153,18 +153,10 @@ + GFile *base_file; + char **lines; + int i, num_entries; +- char *split_char, *playlist_title; +- gboolean dos_mode = FALSE; ++ char *playlist_title; + gboolean fallback; + +- /* figure out whether we're a unix pls or dos pls */ +- if (strstr(contents,"\x0d") == NULL) { +- split_char = "\n"; +- } else { +- split_char = "\x0d\n"; +- dos_mode = TRUE; +- } +- lines = g_strsplit (contents, split_char, 0); ++ lines = g_strsplit_set (contents, "\r\n", 0); + + /* [playlist] */ + i = 0; +@@ -181,7 +173,7 @@ + } + + playlist_title = totem_pl_parser_read_ini_line_string (lines, +- "X-GNOME-Title", dos_mode); ++ "X-GNOME-Title"); + + if (playlist_title != NULL) { + totem_pl_parser_add_uri (parser, +@@ -229,10 +221,10 @@ + /* Genre is our own little extension */ + genre_key = g_strdup_printf ("genre%d", i); + +- file_str = totem_pl_parser_read_ini_line_string (lines, (const char*)file_key, dos_mode); +- title = totem_pl_parser_read_ini_line_string (lines, (const char*)title_key, dos_mode); +- genre = totem_pl_parser_read_ini_line_string (lines, (const char*)genre_key, dos_mode); +- length = totem_pl_parser_read_ini_line_string (lines, (const char*)length_key, dos_mode); ++ file_str = totem_pl_parser_read_ini_line_string (lines, (const char*)file_key); ++ title = totem_pl_parser_read_ini_line_string (lines, (const char*)title_key); ++ genre = totem_pl_parser_read_ini_line_string (lines, (const char*)genre_key); ++ length = totem_pl_parser_read_ini_line_string (lines, (const char*)length_key); + + g_free (file_key); + g_free (title_key); +diff -Nur -x '*.orig' -x '*~' totem-pl-parser-2.26.2/plparse/totem-pl-parser-private.h totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-private.h +--- totem-pl-parser-2.26.2/plparse/totem-pl-parser-private.h 2009-04-24 23:04:44.000000000 +1000 ++++ totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-private.h 2009-05-06 17:56:08.000000000 +1000 +@@ -87,11 +87,10 @@ + }; + + #ifndef TOTEM_PL_PARSER_MINI +-char *totem_pl_parser_read_ini_line_string (char **lines, const char *key, +- gboolean dos_mode); ++char *totem_pl_parser_read_ini_line_string (char **lines, const char *key); + int totem_pl_parser_read_ini_line_int (char **lines, const char *key); + char *totem_pl_parser_read_ini_line_string_with_sep (char **lines, const char *key, +- gboolean dos_mode, const char *sep); ++ const char *sep); + char *totem_pl_parser_base_uri (GFile *file); + void totem_pl_parser_playlist_end (TotemPlParser *parser, + const char *playlist_title); +diff -Nur -x '*.orig' -x '*~' totem-pl-parser-2.26.2/plparse/totem-pl-parser-qt.c totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-qt.c +--- totem-pl-parser-2.26.2/plparse/totem-pl-parser-qt.c 2009-05-03 11:16:45.000000000 +1000 ++++ totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-qt.c 2009-05-06 17:55:59.000000000 +1000 +@@ -72,7 +72,6 @@ + gpointer data) + { + char *contents = NULL; +- gboolean dos_mode = FALSE; + char *volume, *autoplay, *rtspuri; + gsize size; + char **lines; +@@ -80,20 +79,22 @@ + if (g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) == FALSE) + return TOTEM_PL_PARSER_RESULT_ERROR; + +- if (strstr(contents,"\x0d") != NULL) +- dos_mode = TRUE; +- +- lines = g_strsplit (contents, dos_mode ? "\x0d\n" : "\n", 0); ++ lines = g_strsplit_set (contents, "\r\n", 0); + + volume = totem_pl_parser_read_ini_line_string_with_sep +- (lines, "volume", dos_mode, "="); ++ (lines, "volume", "="); + autoplay = totem_pl_parser_read_ini_line_string_with_sep +- (lines, "autoplay", dos_mode, "="); ++ (lines, "autoplay", "="); + + rtspuri = g_strdup (lines[0] + strlen ("RTSPtext")); + if (rtspuri[0] == '\0') { ++ char **line; + g_free (rtspuri); +- rtspuri = g_strdup (lines[1]); ++ ++ for (line = lines; line && *line[0] == '\0'; line++); ++ if (line == NULL) ++ return TOTEM_PL_PARSER_RESULT_ERROR; ++ rtspuri = g_strdup (*line); + } + g_strstrip (rtspuri); + +diff -Nur -x '*.orig' -x '*~' totem-pl-parser-2.26.2/plparse/totem-pl-parser-wm.c totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-wm.c +--- totem-pl-parser-2.26.2/plparse/totem-pl-parser-wm.c 2009-04-24 23:04:44.000000000 +1000 ++++ totem-pl-parser-2.26.2.new/plparse/totem-pl-parser-wm.c 2009-05-06 17:55:42.000000000 +1000 +@@ -84,23 +84,17 @@ + GFile *base_file, + gpointer data) + { +- char *contents, **lines, *ref, *split_char; ++ char *contents, **lines, *ref; + gsize size; + + if (g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) == FALSE) + return TOTEM_PL_PARSER_RESULT_ERROR; + +- if (strstr(contents,"\x0d") == NULL) { +- split_char = "\n"; +- } else { +- split_char = "\x0d\n"; +- } +- +- lines = g_strsplit (contents, split_char, 0); ++ lines = g_strsplit_set (contents, "\n\r", 0); + g_free (contents); + + /* Try to get Ref1 first */ +- ref = totem_pl_parser_read_ini_line_string (lines, "Ref1", FALSE); ++ ref = totem_pl_parser_read_ini_line_string (lines, "Ref1"); + if (ref == NULL) { + g_strfreev (lines); + return totem_pl_parser_add_asx (parser, file, base_file, data); diff -Nru totem-pl-parser-2.26.1/docs/reference/version.xml totem-pl-parser-2.26.2/docs/reference/version.xml --- totem-pl-parser-2.26.1/docs/reference/version.xml 2009-05-06 18:06:18.000000000 +1000 +++ totem-pl-parser-2.26.2/docs/reference/version.xml 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -2.26.2 diff -Nru totem-pl-parser-2.26.1/docs/reference/xml/api-index-2.26.xml totem-pl-parser-2.26.2/docs/reference/xml/api-index-2.26.xml --- totem-pl-parser-2.26.1/docs/reference/xml/api-index-2.26.xml 2009-03-31 22:47:00.000000000 +1100 +++ totem-pl-parser-2.26.2/docs/reference/xml/api-index-2.26.xml 1970-01-01 10:00:00.000000000 +1000 @@ -1,13 +0,0 @@ - - - - -]> - -F -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI -TOTEM_PL_PARSER_FIELD_IMAGE_URI -TOTEM_PL_PARSER_FIELD_URI - - diff -Nru totem-pl-parser-2.26.1/docs/reference/xml/api-index-deprecated.xml totem-pl-parser-2.26.2/docs/reference/xml/api-index-deprecated.xml --- totem-pl-parser-2.26.1/docs/reference/xml/api-index-deprecated.xml 2009-03-31 22:47:00.000000000 +1100 +++ totem-pl-parser-2.26.2/docs/reference/xml/api-index-deprecated.xml 1970-01-01 10:00:00.000000000 +1000 @@ -1,13 +0,0 @@ - - - - -]> - -F -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URL -TOTEM_PL_PARSER_FIELD_IMAGE_URL -TOTEM_PL_PARSER_FIELD_URL - - diff -Nru totem-pl-parser-2.26.1/docs/reference/xml/api-index-full.xml totem-pl-parser-2.26.2/docs/reference/xml/api-index-full.xml --- totem-pl-parser-2.26.1/docs/reference/xml/api-index-full.xml 2009-03-31 22:47:00.000000000 +1100 +++ totem-pl-parser-2.26.2/docs/reference/xml/api-index-full.xml 1970-01-01 10:00:00.000000000 +1000 @@ -1,79 +0,0 @@ - - - - -]> - -A -totem_pl_parser_add_ignored_mimetype -totem_pl_parser_add_ignored_scheme - -F -TOTEM_PL_PARSER_FIELD_ABSTRACT -TOTEM_PL_PARSER_FIELD_ALBUM -TOTEM_PL_PARSER_FIELD_AUTHOR -TOTEM_PL_PARSER_FIELD_AUTOPLAY -TOTEM_PL_PARSER_FIELD_BASE -TOTEM_PL_PARSER_FIELD_CONTACT -TOTEM_PL_PARSER_FIELD_COPYRIGHT -TOTEM_PL_PARSER_FIELD_DESCRIPTION -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URL -TOTEM_PL_PARSER_FIELD_DURATION -TOTEM_PL_PARSER_FIELD_DURATION_MS -TOTEM_PL_PARSER_FIELD_ENDTIME -TOTEM_PL_PARSER_FIELD_FILESIZE -TOTEM_PL_PARSER_FIELD_GENRE -TOTEM_PL_PARSER_FIELD_ID -TOTEM_PL_PARSER_FIELD_IMAGE_URI -TOTEM_PL_PARSER_FIELD_IMAGE_URL -TOTEM_PL_PARSER_FIELD_IS_PLAYLIST -TOTEM_PL_PARSER_FIELD_LANGUAGE -TOTEM_PL_PARSER_FIELD_MOREINFO -TOTEM_PL_PARSER_FIELD_PUB_DATE -TOTEM_PL_PARSER_FIELD_SCREENSIZE -TOTEM_PL_PARSER_FIELD_STARTTIME -TOTEM_PL_PARSER_FIELD_SUMMARY -TOTEM_PL_PARSER_FIELD_TITLE -TOTEM_PL_PARSER_FIELD_UI_MODE -TOTEM_PL_PARSER_FIELD_URI -TOTEM_PL_PARSER_FIELD_URL -TOTEM_PL_PARSER_FIELD_VOLUME - -N -totem_pl_parser_new - -P -totem_pl_parser_parse -totem_pl_parser_parse_date -totem_pl_parser_parse_duration -totem_pl_parser_parse_with_base - -T -TotemDiscMediaType -TotemPlParser -TotemPlParser::entry-parsed -TotemPlParser::playlist-ended -TotemPlParser::playlist-started -TotemPlParser:debug -TotemPlParser:disable-unsafe -TotemPlParser:force -TotemPlParser:recurse -TotemPlParserClass -TotemPlParserError -TotemPlParserIterFunc -TotemPlParserResult -TotemPlParserType -totem_cd_detect_type -totem_cd_detect_type_from_dir -totem_cd_detect_type_with_url -totem_cd_get_human_readable_name -totem_cd_has_medium -totem_cd_mrl_from_type - -W -totem_pl_parser_write -totem_pl_parser_write_with_title - - diff -Nru totem-pl-parser-2.26.1/docs/reference/xml/totem-disc.xml totem-pl-parser-2.26.2/docs/reference/xml/totem-disc.xml --- totem-pl-parser-2.26.1/docs/reference/xml/totem-disc.xml 2009-03-31 22:47:00.000000000 +1100 +++ totem-pl-parser-2.26.2/docs/reference/xml/totem-disc.xml 1970-01-01 10:00:00.000000000 +1000 @@ -1,261 +0,0 @@ - - - - -]> - - -totem-disc -3 -TOTEM-PL-PARSER Library - - - -totem-disc -disc utility functions - - -Stability Level -Stable, unless otherwise indicated - - - -Synopsis - - - -#include <totem-disc.h> - -enum TotemDiscMediaType; -TotemDiscMediaType totem_cd_detect_type (const char *device, - GError **error); -TotemDiscMediaType totem_cd_detect_type_with_url (const char *device, - char **mrl, - GError **error); -TotemDiscMediaType totem_cd_detect_type_from_dir (const char *dir, - char **mrl, - GError **error); -const char * totem_cd_get_human_readable_name (TotemDiscMediaType type); -char * totem_cd_mrl_from_type (const char *scheme, - const char *dir); -gboolean totem_cd_has_medium (const char *device); - - - - - - - - - - - - -Description - -This file has various different disc utility functions for getting -the media types and labels of discs. - - -The functions in this file refer to MRLs, which are a special form -of URIs used by xine to refer to things such as DVDs. An example of -an MRL would be dvd:///dev/scd0, which is not a -valid URI as far as, for example, GIO is concerned. - - -The rest of the totem-pl-parser API exclusively uses URIs. - - - - - -Details - -enum TotemDiscMediaType -TotemDiscMediaTypetypedef enum { - MEDIA_TYPE_ERROR = -1, - MEDIA_TYPE_DATA = 1, - MEDIA_TYPE_CDDA, - MEDIA_TYPE_VCD, - MEDIA_TYPE_DVD, - MEDIA_TYPE_DVB, - MEDIA_TYPE_NUM_TYPES -} TotemDiscMediaType; - - -Gives the media type of a disc, or MEDIA_TYPE_ERROR if the media type -could not be determined. - - - -MEDIA_TYPE_ERROR - there was an error determining the media's type - - - -MEDIA_TYPE_DATA - data disc - - - -MEDIA_TYPE_CDDA - audio CD - - - -MEDIA_TYPE_VCD - video CD - - - -MEDIA_TYPE_DVD - video DVD - - - -MEDIA_TYPE_DVB - digital television - - - -MEDIA_TYPE_NUM_TYPES - the number of supported media types - - - - -totem_cd_detect_type () -totem_cd_detect_typeTotemDiscMediaType totem_cd_detect_type (const char *device, - GError **error); - -Detects the disc's type, given its device node path. - - -Possible error codes are as per totem_cd_detect_type_with_url(). - - -device : - a device node path - -error : - return location for a GError, or NULL - -Returns : TotemDiscMediaType corresponding to the disc's type, or MEDIA_TYPE_ERROR on failure - - - -totem_cd_detect_type_with_url () -totem_cd_detect_type_with_urlTotemDiscMediaType totem_cd_detect_type_with_url (const char *device, - char **mrl, - GError **error); - -Detects the disc's type, given its device node path. If -a string pointer is passed to mrl, it will return the disc's -MRL as from totem_cd_mrl_from_type(). - - -Note that this function does synchronous I/O. - - -Possible error codes are as per totem_cd_detect_type_from_dir(). - - -device : - a device node path - -mrl : - return location for the disc's MRL, or NULL - -error : - return location for a GError, or NULL - -Returns : TotemDiscMediaType corresponding to the disc's type, or MEDIA_TYPE_ERROR on failure - - - -totem_cd_detect_type_from_dir () -totem_cd_detect_type_from_dirTotemDiscMediaType totem_cd_detect_type_from_dir (const char *dir, - char **mrl, - GError **error); - -Detects the disc's type, given its mount directory URI. If -a string pointer is passed to mrl, it will return the disc's -MRL as from totem_cd_mrl_from_type(). - - -Note that this function does synchronous I/O. - - -If no disc is present in the drive, a TOTEM_PL_PARSER_ERROR_NO_DISC -error will be returned. On unknown mounting errors, a -TOTEM_PL_PARSER_ERROR_MOUNT_FAILED error will be returned. On other -I/O errors, or if resolution of symlinked mount paths failed, a code from -GIOErrorEnum will be returned. - - -dir : - a directory URI - -mrl : - return location for the disc's MRL, or NULL - -error : - return location for a GError, or NULL - -Returns : TotemDiscMediaType corresponding to the disc's type, or MEDIA_TYPE_ERROR on failure - - - -totem_cd_get_human_readable_name () -totem_cd_get_human_readable_nameconst char * totem_cd_get_human_readable_name (TotemDiscMediaType type); - -Returns the human-readable name for the given -TotemDiscMediaType. - - -type : - a TotemDiscMediaType - -Returns : the disc media type's readable name, which must not be freed, or NULL for unhandled media types - - - -totem_cd_mrl_from_type () -totem_cd_mrl_from_typechar * totem_cd_mrl_from_type (const char *scheme, - const char *dir); - -Builds an MRL using the scheme scheme and the given URI dir, -taking the filename from the URI if it's a file:// and just -using the whole URI otherwise. - - -scheme : - a scheme (e.g. "dvd") - -dir : - a directory URI - -Returns : a newly-allocated string containing the MRL - - - -totem_cd_has_medium () -totem_cd_has_mediumgboolean totem_cd_has_medium (const char *device); - -Returns whether the disc has a physical medium. - - -device : - a device node path - -Returns : TRUE if the disc physically exists - - - - - - - - - diff -Nru totem-pl-parser-2.26.1/docs/reference/xml/totem-pl-parser.xml totem-pl-parser-2.26.2/docs/reference/xml/totem-pl-parser.xml --- totem-pl-parser-2.26.1/docs/reference/xml/totem-pl-parser.xml 2009-03-31 22:47:00.000000000 +1100 +++ totem-pl-parser-2.26.2/docs/reference/xml/totem-pl-parser.xml 1970-01-01 10:00:00.000000000 +1000 @@ -1,964 +0,0 @@ - - - - -]> - - -TotemPlParser -3 -TOTEM-PL-PARSER Library - - - -TotemPlParser -playlist parser - - -Stability Level -Stable, unless otherwise indicated - - - -Synopsis - - - -#include <totem-pl-parser.h> - -typedef TotemPlParser; -typedef TotemPlParserClass; -enum TotemPlParserResult; -enum TotemPlParserType; -enum TotemPlParserError; -void (*TotemPlParserIterFunc) (GtkTreeModel *model, - GtkTreeIter *iter, - char **uri, - char **title, - gboolean *custom_title, - gpointer user_data); -TotemPlParser * totem_pl_parser_new (void); -TotemPlParserResult totem_pl_parser_parse (TotemPlParser *parser, - const char *uri, - gboolean fallback); -TotemPlParserResult totem_pl_parser_parse_with_base (TotemPlParser *parser, - const char *uri, - const char *base, - gboolean fallback); -gboolean totem_pl_parser_write (TotemPlParser *parser, - GtkTreeModel *model, - TotemPlParserIterFunc func, - const char *output, - TotemPlParserType type, - gpointer user_data, - GError **error); -gboolean totem_pl_parser_write_with_title (TotemPlParser *parser, - GtkTreeModel *model, - TotemPlParserIterFunc func, - const char *output, - const char *title, - TotemPlParserType type, - gpointer user_data, - GError **error); -gint64 totem_pl_parser_parse_duration (const char *duration, - gboolean debug); -guint64 totem_pl_parser_parse_date (const char *date_str, - gboolean debug); -void totem_pl_parser_add_ignored_scheme (TotemPlParser *parser, - const char *scheme); -void totem_pl_parser_add_ignored_mimetype - (TotemPlParser *parser, - const char *mimetype); -#define TOTEM_PL_PARSER_FIELD_URI -#define TOTEM_PL_PARSER_FIELD_URL -#define TOTEM_PL_PARSER_FIELD_GENRE -#define TOTEM_PL_PARSER_FIELD_TITLE -#define TOTEM_PL_PARSER_FIELD_AUTHOR -#define TOTEM_PL_PARSER_FIELD_ALBUM -#define TOTEM_PL_PARSER_FIELD_BASE -#define TOTEM_PL_PARSER_FIELD_VOLUME -#define TOTEM_PL_PARSER_FIELD_AUTOPLAY -#define TOTEM_PL_PARSER_FIELD_DURATION -#define TOTEM_PL_PARSER_FIELD_DURATION_MS -#define TOTEM_PL_PARSER_FIELD_STARTTIME -#define TOTEM_PL_PARSER_FIELD_ENDTIME -#define TOTEM_PL_PARSER_FIELD_COPYRIGHT -#define TOTEM_PL_PARSER_FIELD_ABSTRACT -#define TOTEM_PL_PARSER_FIELD_DESCRIPTION -#define TOTEM_PL_PARSER_FIELD_SUMMARY -#define TOTEM_PL_PARSER_FIELD_MOREINFO -#define TOTEM_PL_PARSER_FIELD_SCREENSIZE -#define TOTEM_PL_PARSER_FIELD_UI_MODE -#define TOTEM_PL_PARSER_FIELD_PUB_DATE -#define TOTEM_PL_PARSER_FIELD_FILESIZE -#define TOTEM_PL_PARSER_FIELD_LANGUAGE -#define TOTEM_PL_PARSER_FIELD_CONTACT -#define TOTEM_PL_PARSER_FIELD_IMAGE_URI -#define TOTEM_PL_PARSER_FIELD_IMAGE_URL -#define TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI -#define TOTEM_PL_PARSER_FIELD_DOWNLOAD_URL -#define TOTEM_PL_PARSER_FIELD_ID -#define TOTEM_PL_PARSER_FIELD_IS_PLAYLIST - - - - -Object Hierarchy - - GObject - +----TotemPlParser - - - - - - - - -Properties - - "debug" gboolean : Read / Write - "disable-unsafe" gboolean : Read / Write - "force" gboolean : Read / Write - "recurse" gboolean : Read / Write / Construct - - - - -Signals - - "entry-parsed" : Run Last - "playlist-ended" : Run Last - "playlist-started" : Run Last - - - - - -Description - -TotemPlParser is a general-purpose playlist parser and writer, with -support for several different types of playlist. - - - - Reading a Playlist - -TotemPlParser *pl = totem_pl_parser_new (); -g_object_set (pl, "recurse", FALSE, "disable-unsafe", TRUE, NULL); -g_signal_connect (G_OBJECT (pl), "playlist-started", G_CALLBACK (playlist_started), NULL); -g_signal_connect (G_OBJECT (pl), "entry-parsed", G_CALLBACK (entry_parsed), NULL); - -if (totem_pl_parser_parse (pl, "http://example.com/playlist.pls", FALSE) != TOTEM_PL_PARSER_RESULT_SUCCESS) - g_error ("Playlist parsing failed."); - -g_object_unref (pl); - - - - - - Getting Metadata from Entries - -static void -entry_parsed (TotemPlParser *parser, const gchar *uri, GHashTable *metadata, gpointer user_data) -{ - gchar *title = g_hash_table_lookup (metadata, TOTEM_PL_PARSER_FIELD_TITLE); - if (title != NULL) - g_message ("Entry title: %s", title); - else - g_message ("Entry (URI: %s) has no title.", uri); -} - - - - - - Writing a Playlist - -void -parser_func (GtkTreeModel *model, GtkTreeIter *iter, - gchar **uri, gchar **title, gboolean *custom_title, - gpointer user_data) -{ - gtk_tree_model_get (model, iter, - 0, uri, - 1, title, - 2, custom_title, - -1); -} - -{ - TotemPlParser *pl; - GtkTreeModel *tree_model; - - pl = totem_pl_parser_new (); - - &slash;* Your tree model can be as simple or as complex as you like; - * parser_func() will just have to return the entry title, URI and custom title flag from it. *&slash; - tree_model = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN); - populate_model (tree_model); - - if (totem_pl_parser_write (pl, tree_model, parser_func, "/tmp/playlist.pls", - TOTEM_PL_PARSER_PLS, NULL, NULL) != TRUE) { - g_error ("Playlist writing failed."); - } - - g_object_unref (tree_model); - g_object_unref (pl); -} - - - - - - - -Details - -TotemPlParser -TotemPlParsertypedef struct TotemPlParser TotemPlParser; - - -All the fields in the TotemPlParser structure are private and should never be accessed directly. - - - -TotemPlParserClass -TotemPlParserClasstypedef struct TotemPlParserClass TotemPlParserClass; - - -The class structure for the TotemPlParser type. - - - -enum TotemPlParserResult -TotemPlParserResulttypedef enum { - TOTEM_PL_PARSER_RESULT_UNHANDLED, - TOTEM_PL_PARSER_RESULT_ERROR, - TOTEM_PL_PARSER_RESULT_SUCCESS, - TOTEM_PL_PARSER_RESULT_IGNORED -} TotemPlParserResult; - - -Gives the result of parsing a playlist. - - - -TOTEM_PL_PARSER_RESULT_UNHANDLED - The playlist could not be handled. - - - -TOTEM_PL_PARSER_RESULT_ERROR - There was an error parsing the playlist. - - - -TOTEM_PL_PARSER_RESULT_SUCCESS - The playlist was parsed successfully. - - - -TOTEM_PL_PARSER_RESULT_IGNORED - The playlist was ignored due to its scheme or MIME type (see totem_pl_parser_add_ignored_scheme() and totem_pl_parser_add_ignored_mimetype()). - - - - -enum TotemPlParserType -TotemPlParserTypetypedef enum { - TOTEM_PL_PARSER_PLS, - TOTEM_PL_PARSER_M3U, - TOTEM_PL_PARSER_M3U_DOS, - TOTEM_PL_PARSER_XSPF, - TOTEM_PL_PARSER_IRIVER_PLA, -} TotemPlParserType; - - -The type of playlist a TotemPlParser will parse. - - - -TOTEM_PL_PARSER_PLS - PLS parser - - - -TOTEM_PL_PARSER_M3U - M3U parser - - - -TOTEM_PL_PARSER_M3U_DOS - M3U (DOS linebreaks) parser - - - -TOTEM_PL_PARSER_XSPF - XSPF parser - - - -TOTEM_PL_PARSER_IRIVER_PLA - iRiver PLA parser - - - - -enum TotemPlParserError -TotemPlParserErrortypedef enum { - TOTEM_PL_PARSER_ERROR_NO_DISC, - TOTEM_PL_PARSER_ERROR_MOUNT_FAILED -} TotemPlParserError; - - -Allows you to differentiate between different -errors occurring during file operations in a TotemPlParser. - - - -TOTEM_PL_PARSER_ERROR_NO_DISC - Error attempting to open a disc device when no disc is present - - - -TOTEM_PL_PARSER_ERROR_MOUNT_FAILED - An attempted mount operation failed - - - - -TotemPlParserIterFunc () -TotemPlParserIterFuncvoid (*TotemPlParserIterFunc) (GtkTreeModel *model, - GtkTreeIter *iter, - char **uri, - char **title, - gboolean *custom_title, - gpointer user_data); - -Functions such as totem_pl_parser_write() accept pointers to TotemPlParserIterFunc()s -as callbacks to call for each entry in the playlist. These functions -are specific to each use of the playlist API, and should set the entry's -uri, title and custom_title return values, getting the data from model -or otherwise. - - -model : - a GtkTreeModel containing the playlist entries - -iter : - a GtkTreeIter pointing to the current row - -uri : - return location for the entry's URI, or NULL - -title : - return location for the entry's title, or NULL - -custom_title : - return location for a boolean which, if TRUE, indicates that the entry's title is custom; or NULL - -user_data : - user data to pass to the function - - - -totem_pl_parser_new () -totem_pl_parser_newTotemPlParser * totem_pl_parser_new (void); - -Creates a TotemPlParser object. - - -Returns : a new TotemPlParser - - - -totem_pl_parser_parse () -totem_pl_parser_parseTotemPlParserResult totem_pl_parser_parse (TotemPlParser *parser, - const char *uri, - gboolean fallback); - -Parses a playlist given by the absolute URI uri. - - -parser : - a TotemPlParser - -uri : - the URI of the playlist to parse - -fallback : - TRUE if the parser should add the playlist URI to the -end of the playlist on parse failure - -Returns : a TotemPlParserResult - - - -totem_pl_parser_parse_with_base () -totem_pl_parser_parse_with_baseTotemPlParserResult totem_pl_parser_parse_with_base (TotemPlParser *parser, - const char *uri, - const char *base, - gboolean fallback); - -Parses a playlist given by the absolute URI uri, using -base to resolve relative paths where appropriate. - - -parser : - a TotemPlParser - -uri : - the URI of the playlist to parse - -base : - the base path for relative filenames - -fallback : - TRUE if the parser should add the playlist URI to the -end of the playlist on parse failure - -Returns : a TotemPlParserResult - - - -totem_pl_parser_write () -totem_pl_parser_writegboolean totem_pl_parser_write (TotemPlParser *parser, - GtkTreeModel *model, - TotemPlParserIterFunc func, - const char *output, - TotemPlParserType type, - gpointer user_data, - GError **error); - -Writes the playlist held by parser and model out to the file of -path output. The playlist is written in the format type and is given -a NULL title. - - -For each entry in the model, the function func is called (and passed -user_data), which gets various metadata values about the entry for -the playlist writer. - - -Possible error codes are as per totem_pl_parser_write_with_title(). - - -parser : - a TotemPlParser - -model : - a GtkTreeModel - -func : - a pointer to a TotemPlParserIterFunc callback function - -output : - the output path and filename - -type : - a TotemPlParserType for the ouputted playlist - -user_data : - a pointer to be passed to each call of func - -error : - return location for a GError, or NULL - -Returns : TRUE on success - - - -totem_pl_parser_write_with_title () -totem_pl_parser_write_with_titlegboolean totem_pl_parser_write_with_title (TotemPlParser *parser, - GtkTreeModel *model, - TotemPlParserIterFunc func, - const char *output, - const char *title, - TotemPlParserType type, - gpointer user_data, - GError **error); - -Writes the playlist held by parser and model out to the file of -path output. The playlist is written in the format type and is -given the title title. - - -For each entry in the model, the function func is called (and passed -user_data), which gets various metadata values about the entry for -the playlist writer. - - -If the output file is a directory the G_IO_ERROR_IS_DIRECTORY error -will be returned, and if the file is some other form of non-regular file -then a G_IO_ERROR_NOT_REGULAR_FILE error will be returned. Some file -systems don't allow all file names, and may return a -G_IO_ERROR_INVALID_FILENAME error, and if the name is too long, -G_IO_ERROR_FILENAME_TOO_LONG will be returned. Other errors are possible -too, and depend on what kind of filesystem the file is on. - - -In extreme cases, a G_IO_ERROR_INVALID_ARGUMENT error can be returned, if -parts of the playlist to be written are too long. - - -If writing a PLA playlist and there is an error converting a URI's encoding, -a code from GConvertError will be returned. - - -parser : - a TotemPlParser - -model : - a GtkTreeModel - -func : - a pointer to a TotemPlParserIterFunc callback function - -output : - the output path and filename - -title : - the playlist title - -type : - a TotemPlParserType for the ouputted playlist - -user_data : - a pointer to be passed to each call of func - -error : - return location for a GError, or NULL - -Returns : TRUE on success - - - -totem_pl_parser_parse_duration () -totem_pl_parser_parse_durationgint64 totem_pl_parser_parse_duration (const char *duration, - gboolean debug); - -Parses the given duration string and returns it as a gint64 -denoting the duration in seconds. - - -duration : - the duration string to parse - -debug : - TRUE if debug statements should be printed - -Returns : the duration in seconds, or -1 on error - - - -totem_pl_parser_parse_date () -totem_pl_parser_parse_dateguint64 totem_pl_parser_parse_date (const char *date_str, - gboolean debug); - -Parses the given date string and returns it as a gint64 -denoting the date in seconds since the UNIX Epoch. - - -date_str : - the date string to parse - -debug : - TRUE if debug statements should be printed - -Returns : the date in seconds, or -1 on error - - - -totem_pl_parser_add_ignored_scheme () -totem_pl_parser_add_ignored_schemevoid totem_pl_parser_add_ignored_scheme (TotemPlParser *parser, - const char *scheme); - -Adds a scheme to the list of schemes to ignore, so that -any URI using that scheme is ignored during playlist parsing. - - -parser : - a TotemPlParser - -scheme : - the scheme to ignore - - - -totem_pl_parser_add_ignored_mimetype () -totem_pl_parser_add_ignored_mimetypevoid totem_pl_parser_add_ignored_mimetype - (TotemPlParser *parser, - const char *mimetype); - -Adds a mimetype to the list of mimetypes to ignore, so that -any URI of that mimetype is ignored during playlist parsing. - - -parser : - a TotemPlParser - -mimetype : - the mimetype to ignore - - - -TOTEM_PL_PARSER_FIELD_URI -TOTEM_PL_PARSER_FIELD_URI#define TOTEM_PL_PARSER_FIELD_URI "url" - - -Metadata field for an entry's URI. - -Since 2.26 - -TOTEM_PL_PARSER_FIELD_URL -TOTEM_PL_PARSER_FIELD_URL#define TOTEM_PL_PARSER_FIELD_URL TOTEM_PL_PARSER_FIELD_URI - -TOTEM_PL_PARSER_FIELD_URL has been deprecated since version 2.26 and should not be used in newly-written code. Use TOTEM_PL_PARSER_FIELD_URI instead. - -Metadata field for an entry's URL. - - - -TOTEM_PL_PARSER_FIELD_GENRE -TOTEM_PL_PARSER_FIELD_GENRE#define TOTEM_PL_PARSER_FIELD_GENRE "genre" - - -Metadata field for an entry's genre. - - - -TOTEM_PL_PARSER_FIELD_TITLE -TOTEM_PL_PARSER_FIELD_TITLE#define TOTEM_PL_PARSER_FIELD_TITLE "title" - - -Metadata field for an entry's displayable title. - - - -TOTEM_PL_PARSER_FIELD_AUTHOR -TOTEM_PL_PARSER_FIELD_AUTHOR#define TOTEM_PL_PARSER_FIELD_AUTHOR "author" - - -Metadata field for an entry's author/composer/director. - - - -TOTEM_PL_PARSER_FIELD_ALBUM -TOTEM_PL_PARSER_FIELD_ALBUM#define TOTEM_PL_PARSER_FIELD_ALBUM "album" - - -Metadata field for an entry's album. - - - -TOTEM_PL_PARSER_FIELD_BASE -TOTEM_PL_PARSER_FIELD_BASE#define TOTEM_PL_PARSER_FIELD_BASE "base" - - -Metadata field for an entry's base path. - - - -TOTEM_PL_PARSER_FIELD_VOLUME -TOTEM_PL_PARSER_FIELD_VOLUME#define TOTEM_PL_PARSER_FIELD_VOLUME "volume" - - -Metadata field for an entry's playback volume. - - - -TOTEM_PL_PARSER_FIELD_AUTOPLAY -TOTEM_PL_PARSER_FIELD_AUTOPLAY#define TOTEM_PL_PARSER_FIELD_AUTOPLAY "autoplay" - - -Metadata field for an entry's "autoplay" flag, which is TRUE if the entry should play automatically. - - - -TOTEM_PL_PARSER_FIELD_DURATION -TOTEM_PL_PARSER_FIELD_DURATION#define TOTEM_PL_PARSER_FIELD_DURATION "duration" - - -Metadata field for an entry's playback duration, which should be parsed using totem_pl_parser_parse_duration(). - - - -TOTEM_PL_PARSER_FIELD_DURATION_MS -TOTEM_PL_PARSER_FIELD_DURATION_MS#define TOTEM_PL_PARSER_FIELD_DURATION_MS "duration-ms" - - -Metadata field for an entry's playback duration, in milliseconds. It's only used when an entry's -duration is available in that format, so one would get either the TOTEM_PL_PARSER_FIELD_DURATION -or TOTEM_PL_PARSER_FIELD_DURATION_MS as metadata. - - - -TOTEM_PL_PARSER_FIELD_STARTTIME -TOTEM_PL_PARSER_FIELD_STARTTIME#define TOTEM_PL_PARSER_FIELD_STARTTIME "starttime" - - -Metadata field for an entry's playback start time, which should be parsed using totem_pl_parser_parse_duration(). - - - -TOTEM_PL_PARSER_FIELD_ENDTIME -TOTEM_PL_PARSER_FIELD_ENDTIME#define TOTEM_PL_PARSER_FIELD_ENDTIME "endtime" - - -Metadata field for an entry's playback end time. - - - -TOTEM_PL_PARSER_FIELD_COPYRIGHT -TOTEM_PL_PARSER_FIELD_COPYRIGHT#define TOTEM_PL_PARSER_FIELD_COPYRIGHT "copyright" - - -Metadata field for an entry's copyright line. - - - -TOTEM_PL_PARSER_FIELD_ABSTRACT -TOTEM_PL_PARSER_FIELD_ABSTRACT#define TOTEM_PL_PARSER_FIELD_ABSTRACT "abstract" - - -Metadata field for an entry's abstract text. - - - -TOTEM_PL_PARSER_FIELD_DESCRIPTION -TOTEM_PL_PARSER_FIELD_DESCRIPTION#define TOTEM_PL_PARSER_FIELD_DESCRIPTION "description" - - -Metadata field for an entry's description. - - - -TOTEM_PL_PARSER_FIELD_SUMMARY -TOTEM_PL_PARSER_FIELD_SUMMARY#define TOTEM_PL_PARSER_FIELD_SUMMARY TOTEM_PL_PARSER_FIELD_DESCRIPTION - - -Metadata field for an entry's summary. (In practice, identical to TOTEM_PL_PARSER_FIELD_DESCRIPTION.) - - - -TOTEM_PL_PARSER_FIELD_MOREINFO -TOTEM_PL_PARSER_FIELD_MOREINFO#define TOTEM_PL_PARSER_FIELD_MOREINFO "moreinfo" - - -Metadata field for an entry's "more info" URI. - - - -TOTEM_PL_PARSER_FIELD_SCREENSIZE -TOTEM_PL_PARSER_FIELD_SCREENSIZE#define TOTEM_PL_PARSER_FIELD_SCREENSIZE "screensize" - - -Metadata field for an entry's preferred screen size. - - - -TOTEM_PL_PARSER_FIELD_UI_MODE -TOTEM_PL_PARSER_FIELD_UI_MODE#define TOTEM_PL_PARSER_FIELD_UI_MODE "ui-mode" - - -Metadata field for an entry's preferred UI mode. - - - -TOTEM_PL_PARSER_FIELD_PUB_DATE -TOTEM_PL_PARSER_FIELD_PUB_DATE#define TOTEM_PL_PARSER_FIELD_PUB_DATE "publication-date" - - -Metadata field for an entry's publication date, which should be parsed using totem_pl_parser_parse_date(). - - - -TOTEM_PL_PARSER_FIELD_FILESIZE -TOTEM_PL_PARSER_FIELD_FILESIZE#define TOTEM_PL_PARSER_FIELD_FILESIZE "filesize" - - -Metadata field for an entry's filesize in bytes. This is only advisory, and can sometimes not match the actual filesize of the stream. - - - -TOTEM_PL_PARSER_FIELD_LANGUAGE -TOTEM_PL_PARSER_FIELD_LANGUAGE#define TOTEM_PL_PARSER_FIELD_LANGUAGE "language" - - -Metadata field for an entry's audio language. - - - -TOTEM_PL_PARSER_FIELD_CONTACT -TOTEM_PL_PARSER_FIELD_CONTACT#define TOTEM_PL_PARSER_FIELD_CONTACT "contact" - - -Metadata field for an entry's contact details for the webmaster. - - - -TOTEM_PL_PARSER_FIELD_IMAGE_URI -TOTEM_PL_PARSER_FIELD_IMAGE_URI#define TOTEM_PL_PARSER_FIELD_IMAGE_URI "image-url" - - -Metadata field for an entry's thumbnail image URI. - -Since 2.26 - -TOTEM_PL_PARSER_FIELD_IMAGE_URL -TOTEM_PL_PARSER_FIELD_IMAGE_URL#define TOTEM_PL_PARSER_FIELD_IMAGE_URL TOTEM_PL_PARSER_FIELD_IMAGE_URI - -TOTEM_PL_PARSER_FIELD_IMAGE_URL has been deprecated since version 2.26 and should not be used in newly-written code. Use TOTEM_PL_PARSER_FIELD_IMAGE_URI instead. - -Metadata field for an entry's thumbnail image URL. - - - -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI#define TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI "download-url" - - -Metadata field for an entry's download URI. Only used if an alternate download -location is available for the entry. - -Since 2.26 - -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URL -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URL#define TOTEM_PL_PARSER_FIELD_DOWNLOAD_URL TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI - -TOTEM_PL_PARSER_FIELD_DOWNLOAD_URL has been deprecated since version 2.26 and should not be used in newly-written code. Use TOTEM_PL_PARSER_FIELD_DOWNLOAD_URI instead. - -Metadata field for an entry's download URL. Only used if an alternate download -location is available for the entry. - - - -TOTEM_PL_PARSER_FIELD_ID -TOTEM_PL_PARSER_FIELD_ID#define TOTEM_PL_PARSER_FIELD_ID "id" - - -Metadata field for an entry's identifier. Its use is dependent on the format -of the playlist parsed, and its origin. - - - -TOTEM_PL_PARSER_FIELD_IS_PLAYLIST -TOTEM_PL_PARSER_FIELD_IS_PLAYLIST#define TOTEM_PL_PARSER_FIELD_IS_PLAYLIST "is-playlist" - - -Metadata field used to tell the calling code that the parsing of a playlist -started. It is only TRUE for the metadata passed to "playlist-started" or -"playlist-ended" signal handlers. - - - - - -Property Details -The <literal>"debug"</literal> property -TotemPlParser:debug "debug" gboolean : Read / Write - -If TRUE, the parser will output debug information. - -Default value: FALSE - -The <literal>"disable-unsafe"</literal> property -TotemPlParser:disable-unsafe "disable-unsafe" gboolean : Read / Write - -If TRUE, the parser will not parse unsafe locations, such as local devices -and local files if the playlist isn't local. This is useful if the library -is parsing a playlist from a remote location such as a website. - -Default value: FALSE - -The <literal>"force"</literal> property -TotemPlParser:force "force" gboolean : Read / Write - -If TRUE, the parser will attempt to parse a playlist, even if it -appears to be unsupported (usually because of its filename extension). - -Default value: FALSE - -The <literal>"recurse"</literal> property -TotemPlParser:recurse "recurse" gboolean : Read / Write / Construct - -If TRUE, the parser will recursively fetch playlists linked to by -the current one. - -Default value: TRUE - - - - -Signal Details -The <literal>"entry-parsed"</literal> signal -TotemPlParser::entry-parsedvoid user_function (TotemPlParser *parser, - gchar *uri, - TotemPlParserMetadata *metadata, - gpointer user_data) : Run Last - -The ::entry-parsed signal is emitted when a new entry is parsed. - - -parser : - the object which received the signal - -uri : - the URI of the entry parsed - -metadata : - a GHashTable of metadata relating to the entry added - -user_data : -user data set when the signal handler was connected. -The <literal>"playlist-ended"</literal> signal -TotemPlParser::playlist-endedvoid user_function (TotemPlParser *parser, - gchar *uri, - gpointer user_data) : Run Last - -The ::playlist-ended signal is emitted when a playlist is finished -parsing. It is only called when "playlist-started" -has been called for that playlist. - - -parser : - the object which received the signal - -uri : - the URI of the playlist that finished parsing. - -user_data : -user data set when the signal handler was connected. -The <literal>"playlist-started"</literal> signal -TotemPlParser::playlist-startedvoid user_function (TotemPlParser *parser, - gchar *uri, - TotemPlParserMetadata *metadata, - gpointer user_data) : Run Last - -The ::playlist-started signal is emitted when a playlist parsing has -started. This signal isn't emitted for all types of playlists, but -can be relied on to be called for playlists which support playlist -metadata, such as title. - - -parser : - the object which received the signal - -uri : - the URI of the new playlist started - -metadata : - a GHashTable of metadata relating to the playlist that -started. - -user_data : -user data set when the signal handler was connected. - - - - - - diff -Nru totem-pl-parser-2.26.1/gtk-doc.make totem-pl-parser-2.26.2/gtk-doc.make --- totem-pl-parser-2.26.1/gtk-doc.make 2009-03-31 22:45:28.000000000 +1100 +++ totem-pl-parser-2.26.2/gtk-doc.make 1970-01-01 10:00:00.000000000 +1000 @@ -1,193 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN = $(LIBTOOL) --mode=execute -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN = -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp -else -all-local: -endif - -docs: html-build.stamp - -$(REPORT_FILES): sgml-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - mkhtml_options=""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ - fi - cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - -install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - $(mkinstalldirs) $${installdir} ; \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $${installdir}; \ - done; \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ - fi; \ - $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ - fi - -uninstall-local: - if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - rm -rf $${installdir} - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs diff -Nru totem-pl-parser-2.26.1/plparse/totem-pl-parser-builtins.c totem-pl-parser-2.26.2/plparse/totem-pl-parser-builtins.c --- totem-pl-parser-2.26.1/plparse/totem-pl-parser-builtins.c 2009-03-31 22:45:57.000000000 +1100 +++ totem-pl-parser-2.26.2/plparse/totem-pl-parser-builtins.c 1970-01-01 10:00:00.000000000 +1000 @@ -1,57 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#include "totem-pl-parser.h" -#include "totem-pl-parser-builtins.h" - -/* enumerations from "totem-pl-parser.h" */ -GType -totem_pl_parser_result_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { TOTEM_PL_PARSER_RESULT_UNHANDLED, "TOTEM_PL_PARSER_RESULT_UNHANDLED", "unhandled" }, - { TOTEM_PL_PARSER_RESULT_ERROR, "TOTEM_PL_PARSER_RESULT_ERROR", "error" }, - { TOTEM_PL_PARSER_RESULT_SUCCESS, "TOTEM_PL_PARSER_RESULT_SUCCESS", "success" }, - { TOTEM_PL_PARSER_RESULT_IGNORED, "TOTEM_PL_PARSER_RESULT_IGNORED", "ignored" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("TotemPlParserResult", values); - } - return etype; -} -GType -totem_pl_parser_type_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { TOTEM_PL_PARSER_PLS, "TOTEM_PL_PARSER_PLS", "pls" }, - { TOTEM_PL_PARSER_M3U, "TOTEM_PL_PARSER_M3U", "m3u" }, - { TOTEM_PL_PARSER_M3U_DOS, "TOTEM_PL_PARSER_M3U_DOS", "m3u-dos" }, - { TOTEM_PL_PARSER_XSPF, "TOTEM_PL_PARSER_XSPF", "xspf" }, - { TOTEM_PL_PARSER_IRIVER_PLA, "TOTEM_PL_PARSER_IRIVER_PLA", "iriver-pla" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("TotemPlParserType", values); - } - return etype; -} -GType -totem_pl_parser_error_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { TOTEM_PL_PARSER_ERROR_NO_DISC, "TOTEM_PL_PARSER_ERROR_NO_DISC", "no-disc" }, - { TOTEM_PL_PARSER_ERROR_MOUNT_FAILED, "TOTEM_PL_PARSER_ERROR_MOUNT_FAILED", "mount-failed" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("TotemPlParserError", values); - } - return etype; -} - -/* Generated data ends here */ - diff -Nru totem-pl-parser-2.26.1/plparse/totem-pl-parser-builtins.h totem-pl-parser-2.26.2/plparse/totem-pl-parser-builtins.h --- totem-pl-parser-2.26.1/plparse/totem-pl-parser-builtins.h 2009-03-24 01:33:17.000000000 +1100 +++ totem-pl-parser-2.26.2/plparse/totem-pl-parser-builtins.h 1970-01-01 10:00:00.000000000 +1000 @@ -1,22 +0,0 @@ - -/* Generated data (by glib-mkenums) */ - -#ifndef __TOTEM_PL_PARSER_BUILTINS_H__ -#define __TOTEM_PL_PARSER_BUILTINS_H__ - -#include - -G_BEGIN_DECLS -/* enumerations from "totem-pl-parser.h" */ -GType totem_pl_parser_result_get_type (void) G_GNUC_CONST; -#define TOTEM_TYPE_PL_PARSER_RESULT (totem_pl_parser_result_get_type()) -GType totem_pl_parser_type_get_type (void) G_GNUC_CONST; -#define TOTEM_TYPE_PL_PARSER_TYPE (totem_pl_parser_type_get_type()) -GType totem_pl_parser_error_get_type (void) G_GNUC_CONST; -#define TOTEM_TYPE_PL_PARSER_ERROR (totem_pl_parser_error_get_type()) -G_END_DECLS - -#endif /* __TOTEM_PL_PARSER_BUILTINS_H__ */ - -/* Generated data ends here */ - diff -Nru totem-pl-parser-2.26.1/plparse/totem-pl-parser-features.h totem-pl-parser-2.26.2/plparse/totem-pl-parser-features.h --- totem-pl-parser-2.26.1/plparse/totem-pl-parser-features.h 2009-05-06 18:06:18.000000000 +1000 +++ totem-pl-parser-2.26.2/plparse/totem-pl-parser-features.h 1970-01-01 10:00:00.000000000 +1000 @@ -1,43 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- - - Copyright (C) 2006 William Jon McCann - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - Authors: William Jon McCann - */ - -#ifndef __TOTEM_PL_PARSER_VERSION_H__ -#define __TOTEM_PL_PARSER_VERSION_H__ - -/* compile time version - */ -#define TOTEM_PL_PARSER_VERSION_MAJOR (2) -#define TOTEM_PL_PARSER_VERSION_MINOR (26) -#define TOTEM_PL_PARSER_VERSION_MICRO (2) - -/* check whether a version equal to or greater than - * major.minor.micro is present. - */ -#define TOTEM_PL_PARSER_CHECK_VERSION(major,minor,micro) \ - (TOTEM_PL_PARSER_VERSION_MAJOR > (major) || \ - (TOTEM_PL_PARSER_VERSION_MAJOR == (major) && TOTEM_PL_PARSER_VERSION_MINOR > (minor)) || \ - (TOTEM_PL_PARSER_VERSION_MAJOR == (major) && TOTEM_PL_PARSER_VERSION_MINOR == (minor) && \ - TOTEM_PL_PARSER_VERSION_MICRO >= (micro))) - - -#endif /* __TOTEM_PL_PARSER_VERSION_H__ */ - diff -Nru totem-pl-parser-2.26.1/plparse/totemplparser-marshal.c totem-pl-parser-2.26.2/plparse/totemplparser-marshal.c --- totem-pl-parser-2.26.1/plparse/totemplparser-marshal.c 2009-03-31 22:45:57.000000000 +1100 +++ totem-pl-parser-2.26.2/plparse/totemplparser-marshal.c 1970-01-01 10:00:00.000000000 +1000 @@ -1,145 +0,0 @@ - -#ifndef __totemplparser_marshal_MARSHAL_H__ -#define __totemplparser_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:STRING,STRING,STRING (./totemplparser-marshal.list:1) */ -G_GNUC_INTERNAL void totemplparser_marshal_VOID__STRING_STRING_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -totemplparser_marshal_VOID__STRING_STRING_STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__STRING_STRING_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - g_marshal_value_peek_string (param_values + 3), - data2); -} - -/* VOID:STRING,BOXED (./totemplparser-marshal.list:2) */ -G_GNUC_INTERNAL void totemplparser_marshal_VOID__STRING_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -totemplparser_marshal_VOID__STRING_BOXED (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_BOXED) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_BOXED callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_BOXED) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), - data2); -} - -G_END_DECLS - -#endif /* __totemplparser_marshal_MARSHAL_H__ */ - diff -Nru totem-pl-parser-2.26.1/plparse/totemplparser-marshal.h totem-pl-parser-2.26.2/plparse/totemplparser-marshal.h --- totem-pl-parser-2.26.1/plparse/totemplparser-marshal.h 2009-03-31 22:45:57.000000000 +1100 +++ totem-pl-parser-2.26.2/plparse/totemplparser-marshal.h 1970-01-01 10:00:00.000000000 +1000 @@ -1,28 +0,0 @@ - -#ifndef __totemplparser_marshal_MARSHAL_H__ -#define __totemplparser_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:STRING,STRING,STRING (./totemplparser-marshal.list:1) */ -G_GNUC_INTERNAL void totemplparser_marshal_VOID__STRING_STRING_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:STRING,BOXED (./totemplparser-marshal.list:2) */ -G_GNUC_INTERNAL void totemplparser_marshal_VOID__STRING_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __totemplparser_marshal_MARSHAL_H__ */ - diff -Nru totem-pl-parser-2.26.1/totem-plparser-mini.pc totem-pl-parser-2.26.2/totem-plparser-mini.pc --- totem-pl-parser-2.26.1/totem-plparser-mini.pc 2009-05-06 18:06:18.000000000 +1000 +++ totem-pl-parser-2.26.2/totem-plparser-mini.pc 1970-01-01 10:00:00.000000000 +1000 @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib64 -includedir=${prefix}/include -gconf_serverdir=${exec_prefix}/libexec - - -Name: totem-plparser-mini -Description: Totem Playlist Parser library, mini version -Version: 2.26.2 -Libs: -L${libdir} -ltotem-plparser-mini -Cflags: -I${includedir}/totem-pl-parser/1/plparser diff -Nru totem-pl-parser-2.26.1/totem-pl-parser.spec totem-pl-parser-2.26.2/totem-pl-parser.spec --- totem-pl-parser-2.26.1/totem-pl-parser.spec 2009-05-06 18:06:18.000000000 +1000 +++ totem-pl-parser-2.26.2/totem-pl-parser.spec 1970-01-01 10:00:00.000000000 +1000 @@ -1,70 +0,0 @@ -Summary: Playlist Parser Library -Name: totem-pl-parser -Version: 2.26.2 -Release: 1 -License: LGPL -Group: Libraries/Multimedia -URL: http://www.gnome.org/projects/totem/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.20/totem-pl-parser-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper -BuildRequires: perl-XML-Parser - -%description -Totem-pl-parser is a library for parsing the various playlist formats used for -online audio and video streams. - -%package devel -Summary: Libraries/include files for Totem-pl-parser. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -Totem-pl-parser is a library for parsing the various playlist formats used for -online audio and video streams. - -This package contains the libraries and includes files necessary to develop -applications with Totem's plparser library. - - -%prep -%setup -q - -%build -%configure - -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -# no static libs and libtool archives either -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING.LIB ChangeLog NEWS README -%{_libdir}/libtotem-plparser.so.* -%{_libdir}/libtotem-plparser-mini.so.* -%{_datadir}/gtk-doc/html -%{_datadir}/locale - -%files devel -%defattr(-, root, root) -%{_includedir}/%{name}/1/plparser -%{_libdir}/pkgconfig/*.pc -%{_libdir}/*so - -%changelog -* Fri Feb 29 2008 Christian Schaller -- First spec file for stand alone library