Changeset 28422e789b04d3173cfb52c5fe1b3e29bd0c51f9

Timestamp:

16/06/06 21:05:55 (2 years ago)

Author:

Yoann Peronneau <yoann@videolan.org>

git-committer:

Yoann Peronneau <yoann@videolan.org> 1150484755 +0000

git-parent:

[baacaea316cff470f3fe11e52a833ef4a51afe74]

git-author:

Yoann Peronneau <yoann@videolan.org> 1150484755 +0000

Message:

* If we are passed a SUB file as subtitle, just open the IDX instead, if there is one. (Closes: #681)

Files:

• src/input/input.c (modified) (2 diffs)

src/input/input.c

@@ -40 +40 @@
-#include "vlc_interface.h"
-#include "vlc_interaction.h"
+
+#include "charset.h"
-
-/*****************************************************************************
@@ -2423 +2425 @@
-    vlc_value_t count;
-    vlc_value_t list;
+    char *psz_path, *psz_extension;
-
-    if( b_check_extension && !subtitles_Filter( psz_subtitle ) )
-    {
-        return VLC_FALSE;
+    }
+
+    /* if we are provided a subtitle.sub file,
+     * see if we don't have a subtitle.idx and use it instead */
+    psz_path = strdup( psz_subtitle );
+    if( psz_path )
+    {
+        psz_extension = strrchr( psz_path, '.');
+        if( psz_extension && strcmp( psz_extension, ".sub" ) == 0 )
+        {
+            FILE *f;
+
+            strcpy( psz_extension, ".idx" );
+            /* FIXME: a portable wrapper for stat() or access() would be more suited */
+            if( ( f = utf8_fopen( psz_path, "rt" ) ) )
+            {
+                fclose( f );
+                msg_Dbg( p_input, "using %s subtitles file instead of %s",
+                         psz_path, psz_subtitle );
+                strcpy( psz_subtitle, psz_path );
+            }
+        }
+        free( psz_path );
-    }
-