summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-09 19:20:52 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-09 19:20:52 +0000
commit543504363f0448ae4df2bc42df49a724256a4b73 (patch)
tree6f3989fac5d80984c8bc6842cf6e5977ed9a2643 /input
parent8305385bb77d9010da88671b27fb1891bd44eee0 (diff)
downloadmpv-543504363f0448ae4df2bc42df49a724256a4b73.tar.bz2
mpv-543504363f0448ae4df2bc42df49a724256a4b73.tar.xz
Add osd_show_progression: Show progress bar and elapsed/total time.
Patch by Hugo Chargois, hugo D chargois A free fr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31028 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 d9706804b7..7e679119ea 100644
--- a/input/input.c
+++ b/input/input.c
@@ -94,6 +94,7 @@ static const mp_cmd_t mp_cmds[] = {
{ 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}}, {MP_CMD_ARG_INT,{-1}}, {MP_CMD_ARG_INT,{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_OSD_SHOW_PROGRESSION, "osd_show_progression", 0, { {-1,{0}} } },
{ MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_BALANCE, "balance", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } },
@@ -400,6 +401,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = {
{ { KEY_DEL, 0 }, "alt_src_step -1" },
{ { 'o', 0 }, "osd" },
{ { 'I', 0 }, "osd_show_property_text \"${filename}\"" },
+ { { 'P', 0 }, "osd_show_progression" },
{ { '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 29e801d374..2df3f03932 100644
--- a/input/input.h
+++ b/input/input.h
@@ -94,6 +94,7 @@ typedef enum {
MP_CMD_SET_PROPERTY,
MP_CMD_GET_PROPERTY,
MP_CMD_OSD_SHOW_PROPERTY_TEXT,
+ MP_CMD_OSD_SHOW_PROGRESSION,
MP_CMD_SEEK_CHAPTER,
MP_CMD_FILE_FILTER,
MP_CMD_GET_FILENAME,