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

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

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

Modified Files:
	mplayer.c 
Log Message:
Add a new command: osd_show_property_text that show an expanded property
string on the OSD. Based on a patch 'by someone named "veal" on irc'
that showed the filename.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -r1.933 -r1.934
--- mplayer.c	22 Apr 2006 19:29:01 -0000	1.933
+++ mplayer.c	23 Apr 2006 14:31:53 -0000	1.934
@@ -4234,6 +4234,16 @@
     case MP_CMD_OSD_SHOW_TEXT :  {
       set_osd_msg(OSD_MSG_TEXT,1,osd_duration,"%-.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);
+      /* if no argument supplied take default osd_duration, otherwise <arg> ms. */
+      if(txt) {
+        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",txt);
+        free(txt);
+      }
+    } break;
     case MP_CMD_LOADFILE : {
       play_tree_t* e = play_tree_new();
       play_tree_add_file(e,cmd->args[0].v.s);