summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-26 15:50:45 +0000
committerlgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-26 15:50:45 +0000
commitef509505f7acf4af80adb717511cb4c78b2e4027 (patch)
tree1d0c431fcc0f729c1bd66cac817ceeff6062e498
parenta138cca8ac96ce102dd042a4f95ce4fcd9684458 (diff)
downloadmpv-ef509505f7acf4af80adb717511cb4c78b2e4027.tar.bz2
mpv-ef509505f7acf4af80adb717511cb4c78b2e4027.tar.xz
The -osdlevel switch for setting default OSD level (useful in your .config for example if you don't like watching OSD timer by default)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@642 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--cfg-mplayer.h2
-rw-r--r--mplayer.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 842e430c45..9556300ad4 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -20,6 +20,7 @@ extern int sdl_forcexv;
#endif
extern int vo_dbpp;
+extern int osd_level;
struct config conf[]={
/* name, pointer, type, flags, min, max */
@@ -30,6 +31,7 @@ struct config conf[]={
{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
{"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},
{"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
+ {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 },
#ifdef HAVE_LIBCSS
{"dvd", &dvd_device, CONF_TYPE_STRING, 0, 0, 0},
{"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0},
diff --git a/mplayer.c b/mplayer.c
index 6c0bec180f..ddf538868b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -93,6 +93,8 @@ int verbose=0;
static subtitle* subtitles=NULL;
void find_sub(subtitle* subtitles,int key);
+int osd_level=2;
+
//**************************************************************************//
// Config file
//**************************************************************************//
@@ -1144,7 +1146,6 @@ double vout_time_usage=0;
double audio_time_usage=0;
int grab_frames=0;
char osd_text_buffer[64];
-int osd_level=2;
int osd_visible=100;
int osd_function=OSD_PLAY;
int osd_last_pts=-303;