[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.153,1.154 mplayer.c,1.512,1.513

[Arpi of Ize]

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

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
pan&scan support with -vo xv by ?? <mplayer at svennevid.net>


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- cfg-mplayer.h	4 Jun 2002 20:12:33 -0000	1.153
+++ cfg-mplayer.h	4 Jun 2002 20:17:05 -0000	1.154
@@ -57,6 +57,7 @@
 extern int vo_gamma_blue_intensity;
 extern int vo_directrendering;
 extern int vd_use_slices;
+extern float vo_panscan;
 
 #ifdef USE_OSD
 extern int osd_level;
@@ -238,6 +239,7 @@
 	// wait for v-sync (vesa)
 	{"vsync", &vo_vsync, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"novsync", &vo_vsync, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
 
 #ifdef HAVE_X11
 	// x11,xv,xmga,xvidix

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- mplayer.c	3 Jun 2002 15:06:30 -0000	1.512
+++ mplayer.c	4 Jun 2002 20:17:05 -0000	1.513
@@ -2544,6 +2544,24 @@
 #endif
 	if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0);
     } break;
+    case MP_CMD_PANSCAN : {
+      int abs= cmd->args[1].v.i;
+      float v = cmd->args[0].v.f;
+      float res;
+      if(abs)
+	res = v;
+      else
+	res = vo_panscan+v;
+      vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res;
+#ifdef USE_OSD
+      if(osd_level){
+	osd_visible=sh_video->fps; // 1 sec
+	vo_osd_progbar_type=OSD_PANSCAN;
+	vo_osd_progbar_value=vo_panscan*256;
+	vo_osd_changed(OSDTYPE_PROGBAR);
+      }
+#endif
+    } break;
     case MP_CMD_SUB_POS:
     {
         int v;