[xine-cvs] CVS: xine-lib/src/dxr3 video_out_dxr3.c,1.33,1.34 video_out_dxr3.h,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/dxr3
In directory usw-pr-cvs1:/tmp/cvs-serv20239/src/dxr3

Modified Files:
	video_out_dxr3.c video_out_dxr3.h 
Log Message:
do not change aspect in zoom mode


Index: video_out_dxr3.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/video_out_dxr3.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- video_out_dxr3.c	28 Jun 2002 16:55:37 -0000	1.33
+++ video_out_dxr3.c	30 Jun 2002 10:47:06 -0000	1.34
@@ -682,6 +682,7 @@
      * just a two value "loop" */
     if (value > ASPECT_FULL) value = ASPECT_ANAMORPHIC;
     this->aspect = value;
+    if (this->pan_scan) break;
     fullscreen = this->overlay_enabled ? is_fullscreen(this) : 0;
     
     if (value == ASPECT_ANAMORPHIC) {
@@ -719,12 +720,13 @@
         if (ioctl(this->fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &val))
           printf("video_out_dxr3: failed to set aspect ratio (%s)\n", strerror(errno));
         dxr3_zoomTV(this);
+        this->pan_scan = 1;
       } else if (value == -1) {
 #if LOG_VID
         printf("video_out_dxr3: disabling 16:9 zoom\n");
 #endif
-        if (ioctl(this->fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &this->aspect))
-          printf("video_out_dxr3: failed to set aspect ratio (%s)\n", strerror(errno));
+        this->pan_scan = 0;
+        dxr3_set_property(this_gen, VO_PROP_ASPECT_RATIO, this->aspect);
       }
     }
     break;

Index: video_out_dxr3.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/dxr3/video_out_dxr3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- video_out_dxr3.h	10 Jun 2002 15:02:48 -0000	1.2
+++ video_out_dxr3.h	30 Jun 2002 10:47:06 -0000	1.3
@@ -80,6 +80,7 @@
   
   int              aspect;
   int              tv_mode;
+  int              pan_scan;
   int              overlay_enabled;
   int              tv_switchable; /* can switch from overlay<->tvout */
   em8300_bcs_t     bcs;