# HG changeset patch # User faust3 # Date 1053163281 0 # Node ID add63fea61ace8a6cf9075fe0f351dfe9711cd90 # Parent 0ddf649cff61bf54f69f503db66579d05aa96110 new slave mode command to show text via osd, patch by Lars Gemeinhardt (reviewed by albeu) diff -r 0ddf649cff61 -r add63fea61ac input/input.c --- a/input/input.c Sat May 17 00:58:13 2003 +0000 +++ b/input/input.c Sat May 17 09:21:21 2003 +0000 @@ -59,6 +59,7 @@ { 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_VOLUME, "volume", 1, { { MP_CMD_ARG_INT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } }, { MP_CMD_MUTE, "mute", 0, { {-1,{0}} } }, diff -r 0ddf649cff61 -r add63fea61ac input/input.h --- a/input/input.h Sat May 17 00:58:13 2003 +0000 +++ b/input/input.h Sat May 17 09:21:21 2003 +0000 @@ -42,6 +42,7 @@ #endif #define MP_CMD_SUB_ALIGNMENT 39 #define MP_CMD_TV_LAST_CHANNEL 40 +#define MP_CMD_OSD_SHOW_TEXT 41 #define MP_CMD_GUI_EVENTS 5000 #define MP_CMD_GUI_LOADFILE 5001 diff -r 0ddf649cff61 -r add63fea61ac mplayer.c --- a/mplayer.c Sat May 17 00:58:13 2003 +0000 +++ b/mplayer.c Sat May 17 09:21:21 2003 +0000 @@ -717,6 +717,7 @@ int osd_function=OSD_PLAY; int osd_last_pts=-303; int osd_show_av_delay = 0; +int osd_show_text = 0; int osd_show_sub_delay = 0; int osd_show_sub_pos = 0; int osd_show_sub_visibility = 0; @@ -1727,6 +1728,7 @@ //float num_frames=0; // number of frames played int grab_frames=0; char osd_text_buffer[64]; +char osd_show_text_buffer[64]; int drop_frame=0; // current dropping status int dropped_frames=0; // how many frames dropped since last non-dropped frame int too_slow_frame_cnt=0; @@ -2492,6 +2494,14 @@ else osd_level= v > MAX_OSD_LEVEL ? MAX_OSD_LEVEL : v; } break; + case MP_CMD_OSD_SHOW_TEXT : { +#ifdef USE_OSD + if(osd_level && sh_video){ + osd_show_text=sh_video->fps; // 1 sec + strncpy(osd_show_text_buffer, cmd->args[0].v.s, 64); + } +#endif + } break; case MP_CMD_VOLUME : { int v = cmd->args[0].v.i; @@ -3263,6 +3273,10 @@ osd_show_tv_channel--; } else #endif + if (osd_show_text) { + snprintf(osd_text_tmp, 63, "%s", osd_show_text_buffer); + osd_show_text--; + } else if (osd_show_sub_visibility) { snprintf(osd_text_tmp, 63, "Subtitles: %sabled", sub_visibility?"en":"dis"); osd_show_sub_visibility--;