Added a --sub-autodetect-path which is a list of paths (separated by

',') where VLC can look for a subtitle file ; typically, ./Subtitles or
./subtitles (the directory in wich the film is located is implicit).

diff --git a/src/input/input.c b/src/input/input.c
index c05a4dca8bafaa8cdb2bec09d9360539ffd9ca2d..ad40294c91389af0fffa179a074a67b74c2c810c 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -121,6 +121,8 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
     var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT );
     var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL |
                 VLC_VAR_DOINHERIT );
+    var_Create( p_input, "sub-autodetect-path", VLC_VAR_STRING |
+                VLC_VAR_DOINHERIT );
     var_Create( p_input, "sub-autodetect-fuzzy", VLC_VAR_INTEGER |
                 VLC_VAR_DOINHERIT );
 
@@ -632,7 +634,7 @@ static int InitThread( input_thread_t * p_input )
 
     /* Parse source string. Syntax : [[<access>][/<demux>]:][<source>] */
     char * psz_parser = p_input->psz_dupsource = strdup(p_input->psz_source);
-    vlc_value_t val;
+    vlc_value_t val, val1;
     int64_t i_microsecondperframe;
 
     subtitle_demux_t *p_sub_toselect = NULL;
@@ -1086,11 +1088,12 @@ static int InitThread( input_thread_t * p_input )
     psz_sub_file = val.psz_string;
 
     var_Get( p_input, "sub-autodetect-file", &val );
+    var_Get( p_input, "sub-autodetect-path", &val1 );
     if( val.b_bool )
     {
         subtitle_demux_t *p_sub;
         int i;
-        char **tmp = subtitles_Detect( p_input, "", p_input->psz_name );
+        char **tmp = subtitles_Detect( p_input, val1.psz_string, p_input->psz_name );
         char **tmp2 = tmp;
         for( i = 0; *tmp2 != NULL; i++ )
         {

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 78b1d00aff78ea7394969ac58fd7bf085223b147..5eeb98eda0e9702db3acdbbf03585d268872dcd0 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -2,7 +2,7 @@
  * subtitles.c
  *****************************************************************************
  * Copyright (C) 2003-2004 VideoLAN
- * $Id: subtitles.c,v 1.10 2004/01/26 20:26:54 gbazin Exp $
+ * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan.org>
  * This is adapted code from the GPL'ed MPlayer (http://mplayerhq.hu)
@@ -160,7 +160,7 @@ static int compare_sub_priority( const void *a, const void *b )
  *
  * \ingroup Demux
  * \param p_this the calling \ref input_thread_t
- * \param psz_path a subdirectory to look into. This is not used atm.
+ * \param psz_path a list of subdirectories (separated by a ',') to look in.
  * \param psz_fname the complete filename to base the search on.
  * \return a NULL terminated array of filenames with detected possible subtitles.
  * The array contains max MAX_SUBTITLE_FILES items and you need to free it after use.
@@ -174,17 +174,64 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
     char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult;
 
     vlc_value_t fuzzy;
-    int len, i, j, i_sub_count;
+    int len, i, j, i_sub_count, i_nb_subdirs;
+    unsigned int k, i_max_sub_len;
     subfn *result; /* unsorted results */
     char **result2; /* sorted results */
+    char **subdirs; /* list of subdirectories to look in */
 
     FILE *f;
     DIR *d;
     struct dirent *de;
 
+    i_nb_subdirs = 1;
+    for( k = 0; k < strlen( psz_path ); k++ )
+    {
+        if( psz_path[k] == ',' ) 
+        {
+            i_nb_subdirs++;
+        }
+    }
+
+    i_max_sub_len = 0;
+    if( i_nb_subdirs >= 0 )
+    {
+        char *psz_parser;
+    
+        subdirs = (char**)malloc( sizeof(char*) * i_nb_subdirs );
+        i = 0;
+        psz_parser = psz_path;
+        while( psz_parser && *psz_parser )
+        {
+            char *psz_subdir;
+            psz_subdir = psz_parser;
+            psz_parser = strchr( psz_subdir, ',' );
+            if( psz_parser )
+            {
+                *psz_parser = '\0';
+                psz_parser++;
+                while( *psz_parser == ' ' )
+                {
+                    psz_parser++;
+                }
+            }
+            subdirs[i] = strdup( psz_subdir );
+            i++;
+            if( strlen( psz_subdir ) > i_max_sub_len )
+            {
+                i_max_sub_len = strlen( psz_subdir );
+            }
+        }
+    } 
+    else 
+    {
+        i_nb_subdirs = -1;
+        subdirs = NULL;
+    }
+
     i_sub_count = 0;
     len = ( strlen( psz_fname ) > 256 ? strlen( psz_fname ) : 256 ) +
-        ( strlen( psz_path ) > 256 ? strlen( psz_path ) : 256 ) + 2;
+        ( i_max_sub_len > 256 ? i_max_sub_len : 256 ) + 2;
 
     f_dir = (char*)malloc(len);
     f_fname = (char*)malloc(len);
@@ -223,12 +270,37 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
     var_Get( p_this, "sub-autodetect-fuzzy", &fuzzy );
 
 
-    for( j = 0; j <= 1; j++)
+    for( j = -1; j < i_nb_subdirs; j++)
     {
-        d = opendir( j == 0 ? f_dir : psz_path );
+        if( j >= 0 )
+        {
+            if( subdirs[j] && subdirs[j][0] == '.' )
+            {
+                char* psz_dir;
+                psz_dir = (char *)malloc( len );
+                if( psz_dir ) 
+                {
+                    sprintf( psz_dir, "%s%s", f_dir, subdirs[j] );
+                    d = opendir( psz_dir );
+                    free( psz_dir );
+                }
+                else d = NULL;
+            }
+            else
+            {
+                d = opendir( subdirs[j] );
+            }
+        }
+        else
+        {
+            d = opendir( f_dir );
+        }
+
         if( d )
         {
             int b_found;
+            msg_Dbg( p_this, "looking for a subtitle file in %s", 
+                     j < 0 ? f_dir : subdirs[j] );
             while( ( de = readdir( d ) ) )
             {
                 /* retrieve various parts of the filename */
@@ -240,7 +312,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
                 b_found = 0;
                 for( i = 0; sub_exts[i]; i++ )
                 {
-                    if( strcmp(sub_exts[i], tmp_fname_ext ) == 0 )
+                    if( strcmp( sub_exts[i], tmp_fname_ext ) == 0 )
                     {
                         b_found = 1;
                         msg_Dbg( p_this, "found a possible subtitle: %s",

diff --git a/src/libvlc.h b/src/libvlc.h
index 92ad3bb73f884b6a74f3361ee6563e13f842bec2..6573a722934144dc6849dbd45901c4d04a6f2eb1 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -345,6 +345,11 @@ static char *ppsz_align_descriptions[] =
     "3 = subtitle file matching the movie name with additional chars\n" \
     "4 = subtitle file matching the movie name exactly")
 
+#define SUB_PATH_TEXT N_("Subtitle autodetection paths")
+#define SUB_PATH_LONGTEXT \
+    N_("Look for a subtitle file in those paths too, if your subtitle " \
+    "file was not found in the current directory.")
+
 #define SUB_FILE_TEXT N_("Use subtitle file")
 #define SUB_FILE_LONGTEXT \
     N_("Load this subtitle file. To be used when autodetect cannot detect " \
@@ -845,6 +850,8 @@ vlc_module_begin();
                  SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE );
     add_integer( "sub-autodetect-fuzzy", 3, NULL,
                  SUB_FUZZY_TEXT, SUB_FUZZY_LONGTEXT, VLC_TRUE );
+    add_string( "sub-autodetect-path", "./Subtitles, ./subtitles", NULL,
+                 SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
     add_file( "sub-file", NULL, NULL,
                  SUB_FILE_TEXT, SUB_FILE_LONGTEXT, VLC_TRUE );
     add_integer( "input-repeat", 0, NULL,