# HG changeset patch
# User yaz
# Date 1169912053 28800
# Node ID 64948ea58c53c5ee863f52e26f13716cdfed1262
# Parent  193bae6b2c8fe7df7f436e8097016da8b148e6ff
[svn] - revise logic of r3808 so that cdaudio works again.

diff -r 193bae6b2c8f -r 64948ea58c53 ChangeLog
--- a/ChangeLog	Sat Jan 27 06:09:45 2007 -0800
+++ b/ChangeLog	Sat Jan 27 07:34:13 2007 -0800
@@ -1,3 +1,18 @@
+2007-01-27 14:09:45 +0000  Michael Farber <01mf02@gmail.com>
+  revision [3862]
+  - removed xmms_ prefix from formatter
+  - moved formatter from libaudacious to audacious
+  
+  
+  trunk/src/audacious/Makefile       |    2 
+  trunk/src/audacious/formatter.c    |  141 +++++++++++++++++++++++++++++++++++++
+  trunk/src/audacious/formatter.h    |   28 +++++++
+  trunk/src/libaudacious/Makefile    |    2 
+  trunk/src/libaudacious/formatter.c |  141 -------------------------------------
+  trunk/src/libaudacious/formatter.h |   28 -------
+  6 files changed, 171 insertions(+), 171 deletions(-)
+
+
 2007-01-27 13:01:55 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [3860]
   - fix an error
diff -r 193bae6b2c8f -r 64948ea58c53 src/audacious/input.c
--- a/src/audacious/input.c	Sat Jan 27 06:09:45 2007 -0800
+++ b/src/audacious/input.c	Sat Jan 27 07:34:13 2007 -0800
@@ -424,9 +424,6 @@
     filename_proxy = g_strdup(filename);
     fd = vfs_buffered_file_new_from_uri(filename_proxy);
 
-    if(!fd)
-        return NULL;
-    
     ext = strrchr(filename_proxy, '.') + 1;
 
     use_ext_filter = (fd != NULL && (!g_strncasecmp(filename, "/", 1) || !g_strncasecmp(filename, "file://", 7))) ? TRUE : FALSE;
@@ -460,7 +457,7 @@
                 continue;
         }
 
-        if (ip->is_our_file_from_vfs != NULL)
+        if (fd && ip->is_our_file_from_vfs != NULL)
         {
             ret = ip->is_our_file_from_vfs(filename_proxy, fd);