Small code factorization

[vlc] / src / input / subtitles.c

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 06b64b9ceabc02cd1845ef90cf2c35b4d2e30c3e..5e46df6ca9c46e15f17f94589ece728c5521a609 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -59,18 +59,16 @@
  * The possible extensions for subtitle files we support
  */
 static const char const sub_exts[][6] = {
+    "idx", "sub",  "srt",
+    "ssa", "ass",  "smi",
     "utf", "utf8", "utf-8",
-    "sub", "srt", "smi",
-    "txt", "ssa", "idx",
-
-    "cdg",
-
+    "txt", "rt",   "aqt",
+    "usf", "jss",  "cdg",
+    "psb", "mpsub","mpl2",
+    "pjs", "dks",
     ""
 };
 
-/* extensions from unsupported types */
-/* rt, aqt, jss, js, ass */
-
 static void strcpy_trim( char *d, const char *s )
 {
     /* skip leading whitespace */
@@ -280,7 +278,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
     }
     else
     {
-#ifdef HAVE_UNISTD_H
+#if defined (HAVE_UNISTD_H) && !defined (UNDER_CE)
         /* Get the current working directory */
         char *psz_cwd = getcwd( NULL, 0 );
 #else