summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-23 14:31:54 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-23 14:31:54 +0000
commit116ca0c768219b10eeee1f68b5b0365916d4b4e0 (patch)
tree7075afee75074168ece904dcb6965df223916a2f /input
parent84b19e7c4ced43ceed6a2cafec76b485403c4165 (diff)
downloadmpv-116ca0c768219b10eeee1f68b5b0365916d4b4e0.tar.bz2
mpv-116ca0c768219b10eeee1f68b5b0365916d4b4e0.tar.xz
Add a new command: osd_show_property_text that show an expanded property
string on the OSD. Based on a patch 'by someone named "veal" on irc' that showed the filename. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18223 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c2
-rw-r--r--input/input.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c
index 651537dc8c..41d4ecf3ae 100644
--- a/input/input.c
+++ b/input/input.c
@@ -66,6 +66,7 @@ static mp_cmd_t mp_cmds[] = {
{ MP_CMD_SUB_STEP, "sub_step",1, { { MP_CMD_ARG_INT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_OSD, "osd",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
{ MP_CMD_OSD_SHOW_TEXT, "osd_show_text", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
+ { MP_CMD_OSD_SHOW_PROPERTY_TEXT, "osd_show_property_text",1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{-1}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } },
{ MP_CMD_MUTE, "mute", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
@@ -327,6 +328,7 @@ static mp_cmd_bind_t def_cmd_binds[] = {
{ { KEY_DEL, 0 }, "alt_src_step -1" },
{ { 'o', 0 }, "osd" },
{ { 'O', 0 }, "osd" },
+ { { 'I', 0 }, "osd_show_property_text \"${filename}\"" },
{ { 'z', 0 }, "sub_delay -0.1" },
{ { 'x', 0 }, "sub_delay +0.1" },
{ { 'g', 0 }, "sub_step -1" },
diff --git a/input/input.h b/input/input.h
index 378bc17624..4bc61041fe 100644
--- a/input/input.h
+++ b/input/input.h
@@ -71,6 +71,7 @@
#define MP_CMD_VO_BORDER 67
#define MP_CMD_SET_PROPERTY 68
#define MP_CMD_GET_PROPERTY 69
+#define MP_CMD_OSD_SHOW_PROPERTY_TEXT 70
#define MP_CMD_GUI_EVENTS 5000
#define MP_CMD_GUI_LOADFILE 5001