diff options
| -rw-r--r-- | DOCS/tech/slave.txt | 2 | ||||
| -rw-r--r-- | input/input.c | 2 | ||||
| -rw-r--r-- | mplayer.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt index 0f321ee0b4..8b4b6ce47a 100644 --- a/DOCS/tech/slave.txt +++ b/DOCS/tech/slave.txt @@ -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> diff --git a/input/input.c b/input/input.c index 41d4ecf3ae..3e98055024 100644 --- a/input/input.c +++ b/input/input.c @@ -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}} } }, @@ -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); |