[Mplayer-cvslog] CVS: main/libvo vo_3dfx.c,1.16,1.17

Alex Beregszaszi alex at mplayerhq.hu
Sat Oct 4 00:33:10 CEST 2003


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

Modified Files:
	vo_3dfx.c 
Log Message:
micro cleanup

Index: vo_3dfx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_3dfx.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vo_3dfx.c	11 Nov 2002 15:20:25 -0000	1.16
+++ vo_3dfx.c	3 Oct 2003 22:33:06 -0000	1.17
@@ -100,7 +100,6 @@
 static Window mywindow;
 static int bpp;
 static XWindowAttributes attribs;
-static int X_already_started = 0;
 
 
 static void 
@@ -139,11 +138,10 @@
 }
 
 static uint32_t 
-create_window(Display *display) 
+create_window(Display *display, char *title) 
 {
 	int screen;
 	unsigned int fg, bg;
-	char *hello = "I hate X11";
 	XSizeHints hint;
 	XVisualInfo vinfo;
 	XEvent xev;
@@ -152,9 +150,6 @@
 	XSetWindowAttributes xswa;
 	unsigned long xswamask;
 
-	if (X_already_started)
-		return -1;
-
 	screen = DefaultScreen(display);
 
 	hint.x = 0;
@@ -194,7 +189,7 @@
 
 	/* Tell other applications about this window */
 
-	XSetStandardProperties(display, mywindow, hello, hello, None, NULL, 0, &hint);
+	XSetStandardProperties(display, mywindow, title, title, None, NULL, 0, &hint);
 
 	/* Map window. */
 
@@ -212,7 +207,6 @@
 	XFlush(display);
 	XSync(display, False);
 
-	X_already_started++;
 	return 0;
 }
 
@@ -347,7 +341,7 @@
 
 	is_fullscreen = fullscreen = 0;
 	if (!is_fullscreen) 
-		create_window(display);
+		create_window(display, title);
 
 	// Ask 3dfx driver for base memory address 0
 	data.port = 0x10; // PCI_BASE_ADDRESS_0_LINUX;



More information about the MPlayer-cvslog mailing list