diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-18 20:37:33 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-18 20:37:33 +0000 |
commit | 6215ef55b8244ba69ab2893b484f854fd7c783eb (patch) | |
tree | 03eb2eafb155b1293f5b45605002db7c5b62b1d3 | |
parent | 7eef93819f9d3f96c8d016e45aba0a5eccdb0d35 (diff) |
add sub autoread & remove 'c' key
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@511 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | mplayer.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -496,6 +496,7 @@ float font_factor=0.75; char *sub_name=NULL; float sub_delay=0; float sub_fps=0; +int sub_auto = 1; //int user_bpp=0; #include "mixer.h" @@ -586,8 +587,12 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ subtitles=sub_read_file(sub_name); if(!subtitles) printf("Can't load subtitles: %s\n",font_name); } else { - // try default: - subtitles=sub_read_file(get_path("default.sub")); + if ( sub_auto ) + { + // auto load sub file ... + subtitles=sub_read_file( sub_filename( filename ) ); + if ( subtitles == NULL ) subtitles=sub_read_file(get_path("default.sub")); // try default: + } else subtitles=sub_read_file(get_path("default.sub")); // try default: } @@ -1702,10 +1707,7 @@ switch(sh_video->codec->driver){ mixer_decvolume(); break; case 'm': - mixer_usemaster=1; - break;; - case 'c': - mixer_usemaster=0; + mixer_usemaster=!mixer_usemaster; break; } if(rel_seek_secs) |