summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-23 14:48:15 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-23 14:48:15 +0000
commit7c3d8688c7c79214355da94dea0e57f7f9875228 (patch)
treeccf6d2aa8302acfbf43599d97e67e9dad10c5f84 /mplayer.c
parent116ca0c768219b10eeee1f68b5b0365916d4b4e0 (diff)
downloadmpv-7c3d8688c7c79214355da94dea0e57f7f9875228.tar.bz2
mpv-7c3d8688c7c79214355da94dea0e57f7f9875228.tar.xz
Align osd_show_text with osd_show_property_text.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18224 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 34363edaa9..b828b75a3d 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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);