diff options
| author | Bastien Nocera <hadess@hadess.net> | 2006-09-10 14:10:28 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2006-09-10 14:10:28 +0000 |
| commit | 36519a31f6fa6f47ac27783c75ad8f7763e63b05 (patch) | |
| tree | 60b5a500765de6de54730bfb0873e971c8e5a1d7 | |
| parent | 67b22999776239dffe8b689fe03aa6e13f4e4eb4 (diff) | |
| download | totem-36519a31f6fa6f47ac27783c75ad8f7763e63b05.tar.gz | |
Detect DVDs even if they're deeper in the folder hierarchy, and set a
2006-09-10 Bastien Nocera <hadess@hadess.net>
* src/plparse/totem-pl-parser.c: (totem_pl_parser_add_directory):
Detect DVDs even if they're deeper in the folder hierarchy, and
set a default title for them
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/plparse/totem-pl-parser.c | 21 |
2 files changed, 19 insertions, 8 deletions
@@ -1,5 +1,11 @@ 2006-09-10 Bastien Nocera <hadess@hadess.net> + * src/plparse/totem-pl-parser.c: (totem_pl_parser_add_directory): + Detect DVDs even if they're deeper in the folder hierarchy, and + set a default title for them + +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) diff --git a/src/plparse/totem-pl-parser.c b/src/plparse/totem-pl-parser.c index 0f15d867b..b95c35bb2 100644 --- a/src/plparse/totem-pl-parser.c +++ b/src/plparse/totem-pl-parser.c @@ -2002,17 +2002,22 @@ totem_pl_parser_add_directory (TotemPlParser *parser, const char *url, MediaType type; GList *list, *l; GnomeVFSResult res; + char *media_url; - if (parser->priv->recurse_level == 1) { - char *media_url; + type = totem_cd_detect_type_from_dir (url, &media_url, NULL); + if (type != MEDIA_TYPE_DATA && type != MEDIA_TYPE_ERROR) { + if (media_url != NULL) { + char *basename = NULL, *fname; - type = totem_cd_detect_type_from_dir (url, &media_url, NULL); - if (type != MEDIA_TYPE_DATA && type != MEDIA_TYPE_ERROR) { - if (media_url != NULL) { - totem_pl_parser_add_one_url (parser, media_url, NULL); - g_free (media_url); - return TOTEM_PL_PARSER_RESULT_SUCCESS; + fname = g_filename_from_uri (url, NULL, NULL); + if (fname != NULL) { + basename = g_filename_display_basename (fname); + g_free (fname); } + totem_pl_parser_add_one_url (parser, media_url, basename); + g_free (basename); + g_free (media_url); + return TOTEM_PL_PARSER_RESULT_SUCCESS; } } |