[Xineliboutput-cvslog] vdr-xineliboutput config.c,1.64,1.65

[Petri H. <phi...@us...>]

Update of /cvsroot/xineliboutput/vdr-xineliboutput
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10693

Modified Files:
	config.c 
Log Message:
Moved file extension lists to const tables


Index: config.c
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/config.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- config.c	18 May 2008 20:24:51 -0000	1.64
+++ config.c	20 May 2008 10:06:20 -0000	1.65
@@ -234,6 +234,91 @@
   NULL
 };
 
+static const char exts_playlist[][4] = {
+  "asx",
+  "m3u",
+  "pls",
+  "ram",
+};
+
+static const char exts_audio[][8] = {
+  "ac3",
+  "asf",
+  "au",
+  "aud",
+  "flac",
+  "mpa",
+  "mpega",
+  "mp2",
+  "mp3",
+  "m4a",
+  "ogg",
+  "ogm",
+  "ra",
+  "spx",
+  "wav",
+  "wma",
+};
+
+static const char exts_video[][8] = {
+  "asf",
+  "avi",
+  "dat",
+  "divx",
+  "dv",
+  "fli",
+  "flv",
+  "iso", /* maybe dvd */
+  "mkv",
+  "mov",
+  "mpeg",
+  "mpg",
+  "mpv",
+  "mp4",
+  "m2v",
+  "m4v",
+  "pes",
+  "rm",
+  "ts",
+  "vdr",
+  "vob",
+  "wmv",
+  "xvid",
+};
+
+static const char exts_image[][8] = {
+  "bmp",
+  "gif",
+  "jpeg",
+  "jpg",
+  "mng",
+  "png",
+  "tiff",
+};
+
+#define DEF_EXT_IS(TYPE) \
+static bool ext_is_ ## TYPE(const char *ext) \
+{ \
+  for(unsigned int i=0; i<sizeof(exts_ ## TYPE)/sizeof(exts_ ## TYPE[0]); i++) \
+    if(!strcasecmp(ext, exts_ ## TYPE[i])) \
+      return true; \
+  return false; \
+} 
+DEF_EXT_IS(playlist)
+DEF_EXT_IS(audio)
+DEF_EXT_IS(video)
+DEF_EXT_IS(image)
+
+static const char *get_extension(const char *fname)
+{
+  if(fname) {
+    const char *pos = strrchr(fname, '.');
+    if(pos)
+      return pos+1;
+  }
+  return NULL;
+}
+
 static char *strcatrealloc(char *dest, const char *src)
 {
   if (!src || !*src) 
@@ -250,104 +335,29 @@
   return dest;
 }
 
+
 bool config_t::IsPlaylistFile(const char *fname)
 {
-  if(fname) {
-    char *pos = strrchr(fname,'.');
-    if(pos) {
-      pos++;
-      if(!strcasecmp(pos, "pls") || 
-	 !strcasecmp(pos, "m3u") || 
-	 !strcasecmp(pos, "ram") ||
-	 !strcasecmp(pos, "asx"))
-	return true;
-    }
-  }
-  return false;
+  const char *ext = get_extension(fname);
+  return ext && ext_is_playlist(ext);
 }
 
 bool config_t::IsAudioFile(const char *fname)
 {
-  if(fname) {
-    char *pos = strrchr(fname,'.');
-    if(pos) {
-      pos++;
-      if(!strcasecmp(pos, "mpa") ||
-	 !strcasecmp(pos, "mp2") ||
-	 !strcasecmp(pos, "mp3") ||
-	 !strcasecmp(pos, "m4a") ||
-	 !strcasecmp(pos, "mpega") ||
-	 !strcasecmp(pos, "flac") ||
-	 !strcasecmp(pos, "ac3") ||
-	 !strcasecmp(pos, "ogg") ||
-	 !strcasecmp(pos, "ogm") ||
-	 !strcasecmp(pos, "au") ||
-	 !strcasecmp(pos, "aud") ||
-	 !strcasecmp(pos, "wma") ||
-	 !strcasecmp(pos, "asf") ||
-	 !strcasecmp(pos, "wav") ||
-	 !strcasecmp(pos, "spx") ||
-	 !strcasecmp(pos, "ra"))
-	return true;
-      return IsPlaylistFile(fname);
-    }
-  }
-  return false;
+  const char *ext = get_extension(fname);
+  return ext && ext_is_audio(ext);
 }
 
 bool config_t::IsVideoFile(const char *fname)
 {
-  if(fname) {
-    char *pos = strrchr(fname,'.');
-    if(pos) {
-      pos++;
-      if(!strcasecmp(pos, "avi") ||
-	 !strcasecmp(pos, "mpv") ||
-	 !strcasecmp(pos, "m2v") ||
-	 !strcasecmp(pos, "m4v") ||
-	 !strcasecmp(pos, "vob") ||
-	 !strcasecmp(pos, "vdr") ||
-	 !strcasecmp(pos, "mpg") ||
-	 !strcasecmp(pos, "mpeg")||
-	 !strcasecmp(pos, "mp4") ||
-	 !strcasecmp(pos, "asf") ||
-	 !strcasecmp(pos, "wmv") ||
-	 !strcasecmp(pos, "mov") ||
-	 !strcasecmp(pos, "ts") ||
-	 !strcasecmp(pos, "pes") ||
-	 !strcasecmp(pos, "xvid") ||
-	 !strcasecmp(pos, "divx") ||
-	 !strcasecmp(pos, "fli") ||
-	 !strcasecmp(pos, "flv") ||
-	 !strcasecmp(pos, "dv") ||
-	 !strcasecmp(pos, "dat") ||
-	 !strcasecmp(pos, "mkv") ||
-	 !strcasecmp(pos, "rm") ||
-	 !strcasecmp(pos, "iso"))  /* maybe dvd */
-	return true;
-      return IsAudioFile(fname);
-    }
-  }
-  return false;
+  const char *ext = get_extension(fname);
+  return ext && (ext_is_video(ext) || ext_is_audio(ext));
 }
 
 bool config_t::IsImageFile(const char *fname)
 {
-  if(fname) {
-    char *pos = strrchr(fname,'.');
-    if(pos) {
-      pos++;
-      if(!strcasecmp(pos, "jpg") ||
-	 !strcasecmp(pos, "jpeg") ||
-	 !strcasecmp(pos, "gif") ||
-	 !strcasecmp(pos, "tiff") || 
-	 !strcasecmp(pos, "bmp") || 
-	 !strcasecmp(pos, "mng") ||
-	 !strcasecmp(pos, "png"))
-	return true;
-    }
-  }
-  return false;
+  const char *ext = get_extension(fname);
+  return ext && ext_is_image(ext);
 }
 
 cString config_t::AutocropOptions(void)