[MPlayer-cvslog] r24153 - trunk/libvo/vo_xv.c

[uau]

Author: uau
Date: Sat Aug 25 06:28:17 2007
New Revision: 24153

Log:
Watch X11 fd in main input select() if using vo xv

Add the X11 fd to main input select() set, and call VO check_events() if
it becomes readable. Only done in vo xv code for now, though would make
sense for other X11-based VOs too.


Modified:
   trunk/libvo/vo_xv.c

Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	(original)
+++ trunk/libvo/vo_xv.c	Sat Aug 25 06:28:17 2007
@@ -39,6 +39,8 @@ Buffer allocation:
 
 #include "subopt-helper.h"
 
+#include "input/input.h"
+
 #ifdef HAVE_NEW_GUI
 #include "gui/interface.h"
 #endif
@@ -713,6 +715,7 @@ static void uninit(void)
 #ifdef HAVE_XF86VM
     vo_vm_close(mDisplay);
 #endif
+    mp_input_rm_event_fd(ConnectionNumber(mDisplay));
     vo_x11_uninit();
 }
 
@@ -834,6 +837,7 @@ static int preinit(const char *arg)
 
     fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats);
 
+    mp_input_add_event_fd(ConnectionNumber(mDisplay), check_events);
     return 0;
 }