[Mplayer-cvslog] CVS: main cfg-common.h,1.93,1.94 subreader.c,1.101,1.102 subreader.h,1.26,1.27

[Jindrich Makovicka CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv19096

Modified Files:
	cfg-common.h subreader.c subreader.h 
Log Message:
turn most of the subtitle matching fuzziness off by default

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- cfg-common.h	7 Apr 2003 16:03:37 -0000	1.93
+++ cfg-common.h	8 Apr 2003 20:40:55 -0000	1.94
@@ -212,6 +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},
 #endif
 #ifdef USE_OSD
 	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL},

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- subreader.c	7 Apr 2003 19:37:19 -0000	1.101
+++ subreader.c	8 Apr 2003 20:40:55 -0000	1.102
@@ -40,6 +40,8 @@
 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
+
 /* Use the SUB_* constant defined in the header file */
 int sub_format=SUB_INVALID;
 #ifdef USE_SORTSUB
@@ -1696,7 +1698,7 @@
 		    } else {
 			// doesn't contain the movie name
 			// don't try in the mplayer subtitle directory
-			if (j == 0) {
+			if ((j == 0) && subfuzzy_enabled) {
 			    sprintf(tmpresult, "%s%s", f_dir, de->d_name);
 			    if ((f = fopen(tmpresult, "rt"))) {
 				fclose(f);

Index: subreader.h
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- subreader.h	7 Apr 2003 16:03:37 -0000	1.26
+++ subreader.h	8 Apr 2003 20:40:55 -0000	1.27
@@ -3,6 +3,7 @@
 
 extern int suboverlap_enabled;
 extern int sub_no_text_pp;  // disable text post-processing
+extern int subfuzzy_enabled;
 
 // subtitle formats
 #define SUB_INVALID   -1