changeset 2113:d1e4f54fb9f5 trunk

[svn] - warning fix - use extension probing by default
author nenolod
date Tue, 12 Dec 2006 20:48:13 -0800
parents 81c744358bab
children 180e466f96bc
files ChangeLog audacious/input.c audacious/main.c
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 12 19:51:25 2006 -0800
+++ b/ChangeLog	Tue Dec 12 20:48:13 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-13 03:51:25 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3229]
+  - improved logic for extension assist
+  
+  trunk/audacious/input.c |   68 ++++++++++++++++++++++++------------------------
+  1 file changed, 34 insertions(+), 34 deletions(-)
+
+
 2006-12-13 03:29:15 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3227]
   - put this back the way it was
--- a/audacious/input.c	Tue Dec 12 19:51:25 2006 -0800
+++ b/audacious/input.c	Tue Dec 12 20:48:13 2006 -0800
@@ -420,7 +420,7 @@
     filename_proxy = g_strdup(filename);
     fd = vfs_fopen(filename, "rb");
 
-    ext = strrchr(filename) + 1;
+    ext = strrchr(filename_proxy, '.') + 1;
 
     for (node = get_input_list(); node != NULL; node = g_list_next(node))
     {
@@ -432,7 +432,7 @@
         vfs_fseek(fd, 0, SEEK_SET);
 
         if (cfg.use_extension_probing == TRUE && ip->vfs_extensions != NULL
-		&& ext != NULL && ext != 1)
+		&& ext != NULL && ext != (gpointer) 0x1)
         {
             gint i;
             gboolean is_our_ext = FALSE;
--- a/audacious/main.c	Tue Dec 12 19:51:25 2006 -0800
+++ b/audacious/main.c	Tue Dec 12 20:48:13 2006 -0800
@@ -205,7 +205,7 @@
     20,				/* delay until the filepopup comes up */
     FALSE,			/* use filename.jpg for coverart */
     FALSE,			/* use XMMS-style file selection */
-    FALSE,                      /* use extension probing         */
+    TRUE,                       /* use extension probing         */
 };
 
 typedef struct bmp_cfg_boolent_t {