toxine-cvs

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/src/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv13776/src/plugins

Modified Files:
	vo_x11.c 
Log Message:
Add vidix support (via X11). call xine_exit() on quit (avoid vidix DGA stays).


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vo_x11.c	13 May 2002 20:46:48 -0000	1.1.1.1
+++ vo_x11.c	3 Jun 2002 14:53:18 -0000	1.2
@@ -892,7 +892,7 @@
   void               *pdummy;
 
   pthread_join(private->timed_thread, &pdummy);
-  
+
   pthread_mutex_lock(&private->mutex);
 
   XLockDisplay(private->display);
@@ -909,7 +909,7 @@
   
   XFreeCursor(private->display, private->cursor.cursors[0]);
   XFreeCursor(private->display, private->cursor.cursors[1]);
-  
+
   XFreeGC(private->display, private->x11_drawable[private->fullscreen].gc);
   XDestroyWindow(private->display, private->x11_drawable[private->fullscreen].video_window);
   
@@ -919,6 +919,9 @@
   XDestroyWindow(private->display, private->x11_drawable[private->fullscreen].video_window);
   
   XUnlockDisplay(private->display);
+    
+  XCloseDisplay(private->display);
+
   pthread_mutex_unlock(&private->mutex);
   
   reenable_screensavers(vop);
@@ -938,7 +941,7 @@
 /*
  *
  */
-static char *_vo_x11_names[] = { "Xv", "XShm", "dxr3_ov", NULL };
+static char *_vo_x11_names[] = { "Xv", "XShm", "dxr3_ov", "vidix", NULL };
 static char **get_names(void) {
   return _vo_x11_names;
 }