# HG changeset patch # User reimar # Date 1120126929 0 # Node ID 0b8c08580412a0aa9e3080f4c7274c4d8a0cf232 # Parent 9c674e1626789f72f1040ab63fd1fe7928de8e6a Missing part of the last commit (got merged in on cvs update :-( ) diff -r 9c674e162678 -r 0b8c08580412 mplayer.c --- a/mplayer.c Thu Jun 30 10:16:35 2005 +0000 +++ b/mplayer.c Thu Jun 30 10:22:09 2005 +0000 @@ -3985,11 +3985,6 @@ //================= Update OSD ==================== #ifdef USE_OSD - if (osd_level == 0 && osd_show_status > 0 && sh_video){ - snprintf(vo_osd_text, 63, "OSD: disabled"); - vo_osd_changed(OSDTYPE_OSD); - osd_show_status--; - } if(osd_level>=1 && sh_video){ int pts=sh_video->pts; char osd_text_tmp[64]; @@ -4121,12 +4116,6 @@ snprintf(osd_text_tmp, 63, "%c %02d:%02d:%02d%s",osd_function,pts/3600,(pts/60)%60,pts%60,percentage_text); } else osd_text_tmp[0]=0; - if (osd_level == 1 && osd_show_status > 0){ - strncpy(osd_text_tmp, "OSD: enabled", 63); - strncpy(vo_osd_text, osd_text_tmp, 63); - vo_osd_changed(OSDTYPE_OSD); - osd_show_status--; - } if(strcmp(vo_osd_text, osd_text_tmp)) { strncpy(vo_osd_text, osd_text_tmp, 63); vo_osd_changed(OSDTYPE_OSD);