[Mplayer-cvslog] CVS: main/libvo video_out.c,1.39,1.40 video_out.h,1.17,1.18 vo_vesa.c,1.68,1.69

[Atmosfear]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv9455/libvo

Modified Files:
	video_out.c video_out.h vo_vesa.c 
Log Message:
add vsync support for doublebuffering to vo_vesa

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- video_out.c	9 Feb 2002 01:30:35 -0000	1.39
+++ video_out.c	12 Feb 2002 15:06:04 -0000	1.40
@@ -41,6 +41,7 @@
 int vo_dheight=0;
 int vo_dbpp=0;
 int vo_doublebuffering = 0;
+int vo_vsync = 0;
 int vo_fsmode = 0;
 
 int vo_pts=0; // for hw decoding

Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- video_out.h	9 Feb 2002 22:38:36 -0000	1.17
+++ video_out.h	12 Feb 2002 15:06:04 -0000	1.18
@@ -177,6 +177,7 @@
 extern int vo_dbpp;
 
 extern int vo_doublebuffering;
+extern int vo_vsync;
 extern int vo_fsmode;
 
 extern int vo_pts;

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vo_vesa.c	9 Feb 2002 10:24:44 -0000	1.68
+++ vo_vesa.c	12 Feb 2002 15:06:04 -0000	1.69
@@ -114,7 +114,7 @@
   static char sbuff[80];
   if((err & VBE_VESA_ERROR_MASK) == VBE_VESA_ERROR_MASK)
   {
-    sprintf(sbuff,"VESA failed = 0x4f%x",(err & VBE_VESA_ERRCODE_MASK)>>8);
+    sprintf(sbuff,"VESA failed = 0x4f%02x",(err & VBE_VESA_ERRCODE_MASK)>>8);
     retval = sbuff;
   }
   else
@@ -361,7 +361,7 @@
   if(vo_doublebuffering && multi_size > 1)
   {
     int err;
-    if((err=vbeSetDisplayStart(multi_buff[multi_idx],1)) != VBE_OK)
+    if((err=vbeSetDisplayStart(multi_buff[multi_idx],vo_vsync)) != VBE_OK)
     {
       vesa_term();
       PRINT_VBE_ERR("vbeSetDisplayStart",err);
@@ -375,10 +375,10 @@
   else
   if(tripple_buffering)
   {
-   vbeSetScheduledDisplayStart(multi_buffer[multi_idx],1);
+   vbeSetScheduledDisplayStart(multi_buff[multi_idx],vo_vsync);
    multi_idx++;
    if(multi_idx > 2) multi_idx = 0;
-   win.ptr = dga_buffer = video_base + multi_buffer[multi_idx];
+   win.ptr = dga_buffer = video_base + multi_buff[multi_idx];
   }
 */
 }