github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Code Releases Activity

Align osd_show_text with osd_show_property_text.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18224 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2006-04-23 14:48:15 +00:00
parent 116ca0c768
commit 7c3d8688c7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/tech/slave.txt
View File

@ -143,7 +143,7 @@ osd_show_property_text <string> [duration] [level]
is shown for [duration] ms. [level] set the minimum OSD level needed for
the message to be visible, default to 0 (always show).
osd_show_text <string>
osd_show_text <string> [duration] [level]
Show <string> on the OSD.
panscan <-1.0 - 1.0> | <0.0 - 1.0> <abs>

2
input/input.c
View File

@ -65,7 +65,7 @@ static mp_cmd_t mp_cmds[] = {
{ MP_CMD_SUB_DELAY, "sub_delay",1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ 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_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_VOLUME, "volume", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } },

4
mplayer.c
View File

@ -4232,7 +4232,9 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
rm_osd_msg(OSD_MSG_OSD_STATUS);
} break;
case MP_CMD_OSD_SHOW_TEXT : {
set_osd_msg(OSD_MSG_TEXT,1,osd_duration,"%-.63s",cmd->args[0].v.s);
set_osd_msg(OSD_MSG_TEXT,cmd->args[2].v.i,
(cmd->args[1].v.i < 0 ? osd_duration : cmd->args[1].v.i),
"%-.63s",cmd->args[0].v.s);
} break;
case MP_CMD_OSD_SHOW_PROPERTY_TEXT : {
char* txt = m_properties_expand_string(mp_properties,cmd->args[0].v.s);