X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=db.c;h=9db622bca3ca6447fcc1659a0c270d49d2b36f60;hp=cb6f692a74cd136a712f961294b3b9fbc735729c;hb=98d0c34a0377546a4ed0062ad32e8161d611d6e6;hpb=e921be422a216b87e3e6812f16b27c9a6927099d diff --git a/db.c b/db.c index cb6f692a..9db622bc 100644 --- a/db.c +++ b/db.c @@ -28,29 +28,6 @@ #include "error.h" #include "string.h" -/* - * return 1 if name matches any supported audio format - */ -static int match_audio_file_name(char *name) -{ - int i,j, len = strlen(name); - - FOR_EACH_AUDIO_FORMAT(i) { - for (j = 0; afl[i].suffixes[j]; j++) { - const char *p = afl[i].suffixes[j]; - int plen = strlen(p); - if (len < plen + 1) - continue; - if (name[len - plen - 1] != '.') - continue; - if (strcasecmp(name + len - plen, p)) - continue; - return 1; - } - } - return 0; -} - /** * traverse the given directory recursively * @@ -103,7 +80,7 @@ int find_audio_files(const char *dirname, int (*f)(const char *, const char *)) if (!S_ISREG(m) && !S_ISDIR(m)) /* skip links, sockets, ... */ continue; if (S_ISREG(m)) { /* regular file */ - if (!match_audio_file_name(entry->d_name)) + if (guess_audio_format(entry->d_name) < 0) continue; if (f(dirname, entry->d_name) < 0) goto out;