option for sub match fuzziness level

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9894 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 32 insertions, 11 deletions

diff --git a/DOCS/en/mplayer.1 b/DOCS/en/mplayer.1
index bfb1c76a06..d1231f53a8 100644
--- a/DOCS/en/mplayer.1
+++ b/DOCS/en/mplayer.1
@@ -1081,9 +1081,19 @@ Tells MPlayer to handle the subtitle file as UTF8.
 Disables any kind of text post processing done after loading the subtitles.
 Used for debug purposes.
 .TP
-.B \-subfuzzy
-Relax when trying to find matching subtitles. Loads all subtitles in
-the current directory, allowing to select the right ones during playing.
+.B \-sub-fuzziness
+Adjust matching fuzziness when searching for subtitles:
+.PD 0
+.RSs
+.IPs 0
+exact match
+.IPs 1
+load all subs containing movie name
+.IPs 2
+load all subs in the current directory
+.RE
+.PD 1
+.
 .TP
 .B \-vobsub <vobsub\ file\ without\ extension>
 Specify the VobSub files that are to be used for subtitle.
diff --git a/cfg-common.h b/cfg-common.h
index 78e9a9c0dc..4ecdfea0ad 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -212,7 +212,7 @@
 	{"sub-bg-color", &sub_bg_color, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
 	{"sub-bg-alpha", &sub_bg_alpha, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
 	{"sub-no-text-pp", &sub_no_text_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"subfuzzy", &subfuzzy_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"sub-fuzziness", &sub_match_fuzziness, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
 #endif
 #ifdef USE_OSD
 	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
diff --git a/subreader.c b/subreader.c
index 1563438fcb..149b3f3c44 100644
--- a/subreader.c
+++ b/subreader.c
@@ -40,7 +40,7 @@ static int sub_slacktime = 20000; //20 sec
 int sub_no_text_pp=0;   // 1 => do not apply text post-processing
                         // like {\...} elimination in SSA format.
 
-int subfuzzy_enabled=0; // be _really_ fuzzy when looking for subtitles
+int sub_match_fuzziness=0; // level of sub name matching fuzziness
 
 /* Use the SUB_* constant defined in the header file */
 int sub_format=SUB_INVALID;
@@ -1574,7 +1574,10 @@ typedef struct _subfn
 
 static int compare_sub_priority(const void *a, const void *b)
 {
-    return ((subfn*)a)->priority < ((subfn*)b)->priority;
+    int ret;
+    ret = ((subfn*)a)->priority < ((subfn*)b)->priority;
+    if (ret != 0) return ret;
+    return strcoll(((subfn*)a)->fname, ((subfn*)b)->fname);
 }
 
 char** sub_filenames(char* path, char *fname)
@@ -1663,9 +1666,17 @@ char** sub_filenames(char* path, char *fname)
  
 		// we have a (likely) subtitle file
 		if (found) {
-		    // does it contain the movie name?
-		    tmp = strstr(tmp_fname_trim, f_fname_trim);
-		    if (tmp) {
+		    if (strcmp(tmp_fname_trim, f_fname_trim) == 0) {
+			// matches the movie name?
+			sprintf(tmpresult, "%s%s", f_dir, de->d_name);
+			if ((f = fopen(tmpresult, "rt"))) {
+			    fclose(f);
+			    result[subcnt].priority = 4;
+			    result[subcnt].fname = strdup(tmpresult);
+			    subcnt++;
+			}
+		    } else if ((tmp = strstr(tmp_fname_trim, f_fname_trim)) && (sub_match_fuzziness >= 1)) {
+			// does it contain the movie name?
 			tmp += strlen(f_fname_trim);
 			if (tmp_sub_id && strstr(tmp, tmp_sub_id)) {
 			    // with sub_id specified prefer localized subtitles
@@ -1698,7 +1709,7 @@ char** sub_filenames(char* path, char *fname)
 		    } else {
 			// doesn't contain the movie name
 			// don't try in the mplayer subtitle directory
-			if ((j == 0) && subfuzzy_enabled) {
+			if ((j == 0) && (sub_match_fuzziness >= 2)) {
 			    sprintf(tmpresult, "%s%s", f_dir, de->d_name);
 			    if ((f = fopen(tmpresult, "rt"))) {
 				fclose(f);
diff --git a/subreader.h b/subreader.h
index 361e4aa317..3b6b4c60c2 100644
--- a/subreader.h
+++ b/subreader.h
@@ -3,7 +3,7 @@
 
 extern int suboverlap_enabled;
 extern int sub_no_text_pp;  // disable text post-processing
-extern int subfuzzy_enabled;
+extern int sub_match_fuzziness;
 
 // subtitle formats
 #define SUB_INVALID   -1