[Mplayer-cvslog] CVS: main/libvo vesa_lvo.c,1.14,1.15 vo_vesa.c,1.60,1.61

[Nick Kurshev]

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

Modified Files:
	vesa_lvo.c vo_vesa.c 
Log Message:
code cleanup

Index: vesa_lvo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vesa_lvo.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vesa_lvo.c	27 Jan 2002 08:05:56 -0000	1.14
+++ vesa_lvo.c	3 Feb 2002 09:12:32 -0000	1.15
@@ -47,8 +47,16 @@
 
 extern vo_functions_t video_out_vesa;
 
+static void vlvo_query_vaa(vo_vaa_t *vaa)
+{
+  memset(vaa,0,sizeof(vo_vaa_t));
+}
+
 int vlvo_preinit(const char *drvname)
 {
+  printf("vesa_lvo: This branch is no longer supported.\n"
+	 "vesa_lvo: Please use -vo vesa:vidix instead\n");
+  return -1;
   if(verbose > 1) printf("vesa_lvo: vlvo_preinit(%s) was called\n",drvname);
 	lvo_handler = open(drvname,O_RDWR);
 	if(lvo_handler == -1)
@@ -62,6 +70,7 @@
 	video_out_vesa.flip_page=vlvo_flip_page;
 	video_out_vesa.draw_osd=vlvo_draw_osd;
 	video_out_vesa.query_format=vlvo_query_info;
+	video_out_vesa.query_vaa=vlvo_query_vaa;
 	return 0;
 }
 
@@ -70,6 +79,9 @@
 		   unsigned dst_height,unsigned format,unsigned dest_bpp)
 {
   size_t i,awidth;
+  printf("vesa_lvo: This branch is no longer supported.\n"
+	 "vesa_lvo: Please use -vo vesa:vidix instead\n");
+  return -1;
   if(verbose > 1) printf("vesa_lvo: vlvo_init() was called\n");
 	image_width = src_width;
 	image_height = src_height;

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- vo_vesa.c	31 Jan 2002 10:23:39 -0000	1.60
+++ vo_vesa.c	3 Feb 2002 09:12:32 -0000	1.61
@@ -338,11 +338,7 @@
     if(!HAS_DGA()) __vbeCopyData(dga_buffer);
     flip_trigger = 0;
   }
-  if(vo_doublebuffering && multi_size > 1 && !lvo_name
-#ifdef CONFIG_VIDIX
-   && !vidix_name
-#endif
-   )
+  if(vo_doublebuffering && multi_size > 1)
   {
     int err;
     if((err=vbeSetDisplayStart(multi_buff[multi_idx],1)) != VBE_OK)
@@ -400,11 +396,7 @@
       if(verbose > 2)
           printf("vo_vesa: rgb2rgb_fnc was called\n");
     } 
-    if((!rgb2rgb_fnc || !HAS_DGA()) && !lvo_name
-#ifdef CONFIG_VIDIX
-     && !vidix_name
-#endif
-     ) __vbeCopyData(data);
+    if(!rgb2rgb_fnc || !HAS_DGA()) __vbeCopyData(data);
     return 0;
 }