[MPlayer-cvslog] CVS: main mplayer.c,1.934,1.935

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv25609

Modified Files:
	mplayer.c 
Log Message:
Align osd_show_text with osd_show_property_text.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -r1.934 -r1.935
--- mplayer.c	23 Apr 2006 14:31:53 -0000	1.934
+++ mplayer.c	23 Apr 2006 14:48:15 -0000	1.935
@@ -4232,7 +4232,9 @@
 	  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);