[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.28,1.29 vo_mga.c,1.29,1.30 vo_xmga.c,1.55,1.56

[Arpi of Ize]

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

Modified Files:
	mga_common.c vo_mga.c vo_xmga.c 
Log Message:
open(/dev/mga_vid) moved to preinit

Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mga_common.c	31 Mar 2002 20:39:38 -0000	1.28
+++ mga_common.c	31 Mar 2002 20:45:31 -0000	1.29
@@ -292,6 +292,15 @@
 
 static uint32_t preinit(const char *arg)
 {
+  char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
+
+	f = open(devname,O_RDWR);
+	if(f == -1)
+	{
+		perror("open");
+		printf("Couldn't open %s\n",devname); 
+		return(-1);
+	}
   return 0;
 }
 

Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vo_mga.c	29 Mar 2002 05:03:25 -0000	1.29
+++ vo_mga.c	31 Mar 2002 20:45:31 -0000	1.30
@@ -60,9 +60,8 @@
 static uint32_t
 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
 {
-char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
 
-	if (f >= 0) mga_uninit();
+//	if (f >= 0) mga_uninit();
 	if(!vo_screenwidth || !vo_screenheight) {
 		int fd;
 		struct fb_var_screeninfo fbinfo;
@@ -92,13 +91,6 @@
 		printf("vo_mga aspect(): resized to %dx%d\n",d_width,d_height);
 	}
 
-
-	f = open(devname,O_RDWR);
-	if(f == -1)
-	{
-		printf("Couldn't open %s\n",devname); 
-		return(-1);
-	}
 
         switch(format){
         case IMGFMT_YV12:

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vo_xmga.c	24 Mar 2002 20:45:30 -0000	1.55
+++ vo_xmga.c	31 Mar 2002 20:45:31 -0000	1.56
@@ -202,16 +202,6 @@
  XGCValues              xgcv;
  unsigned long          xswamask;
 
-  char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
-
-	f = open(devname,O_RDWR);
-	if(f == -1)
-	{
-		perror("open");
-		printf("Couldn't open %s\n",devname); 
-		return(-1);
-	}
-
  width+=width&1;
 
  switch(format)