[Mplayer-cvslog] CVS: main mplayer.c,1.343,1.344

Zoltan Ponekker pontscho at mplayer.dev.hu
Tue Dec 18 12:16:14 CET 2001


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

Modified Files:
	mplayer.c 
Log Message:
small changes

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- mplayer.c	17 Dec 2001 16:56:56 -0000	1.343
+++ mplayer.c	18 Dec 2001 11:16:08 -0000	1.344
@@ -628,7 +628,7 @@
 	printf("Using %s timing\n",softsleep?"software":"usleep()");
 
 #ifdef USE_TERMCAP
-  if ( !use_gui ) load_termcap(NULL); // load key-codes
+  load_termcap(NULL); // load key-codes
 #endif
 
 // ========== Init keyboard FIFO (connection to libvo) ============
@@ -685,10 +685,12 @@
 #ifdef USE_SUB
 // check .sub
   if(sub_name){
+#if 0
        int l=strlen(sub_name);
        if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
 		   ||(0==strcmp(&sub_name[l-4],".UTF"))))
 	  sub_utf8=1;
+#endif  
        subtitles=sub_read_file(sub_name);
        if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
   }
@@ -696,7 +698,9 @@
       if(sub_auto && filename) { // auto load sub file ...
          subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
       }
+#if 0
       if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default
+#endif
   }
 #endif
 




More information about the MPlayer-cvslog mailing list