summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-18 11:16:08 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-18 11:16:08 +0000
commitde2e7adfbd58b98ed3af5077742a682c46f373bf (patch)
treea6876752b1dd3dc8270ac3010851f03ac5c4a8d1 /mplayer.c
parent6682ec830bf04c126d8a523773ab6ed31f94a7d1 (diff)
downloadmpv-de2e7adfbd58b98ed3af5077742a682c46f373bf.tar.bz2
mpv-de2e7adfbd58b98ed3af5077742a682c46f373bf.tar.xz
small changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3581 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 99d3ea0fb2..bc24ce641a 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -628,7 +628,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
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 @@ play_next_file:
#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 @@ play_next_file:
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