Mercurial > audlegacy
changeset 2114:180e466f96bc trunk
[svn] - at present, only use extension filtering in the file:// namespace.
author | nenolod |
---|---|
date | Tue, 12 Dec 2006 23:13:01 -0800 |
parents | d1e4f54fb9f5 |
children | 13da6ea5e4da |
files | ChangeLog audacious/input.c |
diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Dec 12 20:48:13 2006 -0800 +++ b/ChangeLog Tue Dec 12 23:13:01 2006 -0800 @@ -1,3 +1,13 @@ +2006-12-13 04:48:13 +0000 William Pitcock <nenolod@nenolod.net> + revision [3231] + - warning fix + - use extension probing by default + + trunk/audacious/input.c | 4 ++-- + trunk/audacious/main.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + + 2006-12-13 03:51:25 +0000 William Pitcock <nenolod@nenolod.net> revision [3229] - improved logic for extension assist
--- a/audacious/input.c Tue Dec 12 20:48:13 2006 -0800 +++ b/audacious/input.c Tue Dec 12 23:13:01 2006 -0800 @@ -416,12 +416,17 @@ gchar *filename_proxy; gint ret = 1; gchar *ext; + gboolean use_ext_filter; filename_proxy = g_strdup(filename); fd = vfs_fopen(filename, "rb"); ext = strrchr(filename_proxy, '.') + 1; + use_ext_filter = + (!g_strcasecmp(fd->base->uri_id, "/") || + !g_strcasecmp(fd->base->uri_id, "file")) ? TRUE : FALSE; + for (node = get_input_list(); node != NULL; node = g_list_next(node)) { ip = INPUT_PLUGIN(node->data); @@ -432,7 +437,7 @@ vfs_fseek(fd, 0, SEEK_SET); if (cfg.use_extension_probing == TRUE && ip->vfs_extensions != NULL - && ext != NULL && ext != (gpointer) 0x1) + && ext != NULL && ext != (gpointer) 0x1 && use_ext_filter == TRUE) { gint i; gboolean is_our_ext = FALSE;