[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.209,1.210 mplayer.c,1.736,1.737

[Joey Parrish CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv7217

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
runtime 'stay-on-top' functionality


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- cfg-mplayer.h	27 Oct 2003 00:23:04 -0000	1.209
+++ cfg-mplayer.h	30 Nov 2003 16:35:38 -0000	1.210
@@ -63,6 +63,7 @@
 extern int vo_gamma_contrast;
 extern int vo_gamma_hue;
 extern char *vo_geometry;
+extern int vo_ontop;
 
 extern int opt_screen_size_x;
 extern int opt_screen_size_y;
@@ -181,6 +182,8 @@
 	{"ao", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 	{"fixed-vo", &fixed_vo, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL},
 	{"nofixed-vo", &fixed_vo, CONF_TYPE_FLAG,CONF_GLOBAL, 0, 0, NULL},
+	{"ontop", &vo_ontop, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"noontop", &vo_ontop, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 
 	{"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 	{"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- mplayer.c	1 Nov 2003 15:16:19 -0000	1.736
+++ mplayer.c	30 Nov 2003 16:35:38 -0000	1.737
@@ -736,6 +736,7 @@
 int osd_show_sub_changed = 0;
 int osd_show_percentage = 0;
 int osd_show_tv_channel = 25;
+int osd_show_ontop = 0;
 
 int rtc_fd=-1;
 
@@ -3001,6 +3002,17 @@
 #endif
 	if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0);
     } break;
+    case MP_CMD_VO_ONTOP:
+    {
+     if(video_out && vo_config_count) {
+       video_out->control(VOCTRL_ONTOP, 0);
+#ifdef USE_OSD
+       osd_show_ontop=10;
+       vo_osd_changed(OSDTYPE_SUBTITLE);
+#endif
+     }
+
+    } break;
     case MP_CMD_PANSCAN : {
       if ( !video_out ) break;
       if ( video_out->control( VOCTRL_GET_PANSCAN,NULL ) == VO_TRUE )
@@ -3551,6 +3563,9 @@
       if (osd_show_av_delay) {
 	  snprintf(osd_text_tmp, 63, "A-V delay: %d ms", ROUND(audio_delay*1000));
 	  osd_show_av_delay--;
+      } else if (osd_show_ontop) {
+	  snprintf(osd_text_tmp, 63, "Stay on top: %sabled", vo_ontop?"en":"dis");
+	  osd_show_ontop--;
       } else if(osd_level>=2) {
           int len = demuxer_get_time_length(demuxer);
           int percentage = -1;