Mercurial > hg > xmms-sid

changeset 846:7b11ba6fc4cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve and fix probing (FP backend wasn't used when checking filename extensions).
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 08 Nov 2012 22:43:45 +0200
parents f54ef18673e6
children 5b93bd8c7814
files src/xmms-sid.c
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/xmms-sid.c	Thu Nov 08 21:58:30 2012 +0200
+++ b/src/xmms-sid.c	Thu Nov 08 22:43:45 2012 +0200
@@ -271,15 +271,16 @@
         return FALSE;
 
     /* Try to detect via detection routine, if required */
-    if (xs_cfg.detectMagic)
+    if (xs_cfg.detectMagic && xs_status.engine->plrProbe != NULL)
     {
+        gboolean res = FALSE;
         XSFile *f;
         if ((f = xs_fopen(filename, "rb")) != NULL)
         {
-            if (xs_status.engine->plrProbe(f))
-                return TRUE;
+            res = xs_status.engine->plrProbe(f);
             xs_fclose(f);
         }
+        return res;
     }
 
     /* Detect just by checking filename extension */
@@ -290,7 +291,6 @@
         switch (xs_cfg.playerEngine)
         {
             case XS_ENG_SIDPLAY1:
-            case XS_ENG_SIDPLAY2:
                 if (!g_strcasecmp(ext, "psid"))
                     return TRUE;
                 if (!g_strcasecmp(ext, "sid"))
@@ -302,6 +302,12 @@
                 if (!g_strcasecmp(ext, "info"))
                     return TRUE;
                 break;
+
+            case XS_ENG_SIDPLAY2:
+            case XS_ENG_SIDPLAYFP:
+                if (!g_strcasecmp(ext, "sid"))
+                    return TRUE;
+                break;
         }
     }