[MPlayer-cvslog] CVS: main cfg-mplayer.h, 1.253, 1.254 mplayer.c, 1.886, 1.887

[Joey Parrish CVS]

CVS change done by Joey Parrish CVS

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

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
add a switch, slave command, and vo control to toggle borderless window.
includes documentation.

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- cfg-mplayer.h	27 Sep 2005 08:32:36 -0000	1.253
+++ cfg-mplayer.h	10 Nov 2005 22:25:53 -0000	1.254
@@ -45,6 +45,7 @@
 extern int vo_gamma_hue;
 extern char *vo_geometry;
 extern int vo_ontop;
+extern int vo_border;
 extern int vo_keepaspect;
 extern int vo_rootwin;
 
@@ -144,6 +145,8 @@
 	{"ontop", &vo_ontop, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"noontop", &vo_ontop, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"border", &vo_border, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"noborder", &vo_border, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 
 	{"aop", "-aop is deprecated, use -af instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 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.886
retrieving revision 1.887
diff -u -r1.886 -r1.887
--- mplayer.c	9 Nov 2005 23:18:38 -0000	1.886
+++ mplayer.c	10 Nov 2005 22:25:53 -0000	1.887
@@ -1062,6 +1062,7 @@
 int osd_show_tv_channel = 25;
 int osd_show_ontop = 0;
 int osd_show_rootwin = 0;
+int osd_show_border = 0;
 int osd_show_framedropping = 0;
 int osd_show_status = 0;
 
@@ -3442,6 +3443,17 @@
      }
 
     } break;
+    case MP_CMD_VO_BORDER:
+    {
+     if(video_out && vo_config_count) {
+       video_out->control(VOCTRL_BORDER, 0);
+#ifdef USE_OSD
+       osd_show_border=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 )
@@ -4212,6 +4224,9 @@
       } else if (osd_show_rootwin) {
 	  snprintf(osd_text_tmp, 63, MSGTR_OSDRootwin, vo_rootwin? MSGTR_OSDenabled : MSGTR_OSDdisabled);
 	  osd_show_rootwin--;
+      } else if (osd_show_border) {
+	  snprintf(osd_text_tmp, 63, MSGTR_OSDBorder, vo_border? MSGTR_OSDenabled : MSGTR_OSDdisabled);
+	  osd_show_border--;
       } else if (osd_show_framedropping) {
 	  snprintf(osd_text_tmp, 63, MSGTR_OSDFramedrop,
 	     (frame_dropping == 1 ? MSGTR_OSDFramedropOn :