[Toxine-cvs] CVS: toxine/src/plugins vo_dxr3.c,1.4,1.5 vo_x11.c,1.6,1.7

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

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

Modified Files:
	vo_dxr3.c vo_x11.c 
Log Message:
typos, update cursor visiblity when fullscreen toggle is activated with 
vo->fullscreen() call.


Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_dxr3.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_dxr3.c	3 Jul 2002 09:03:17 -0000	1.4
+++ vo_dxr3.c	3 Jul 2002 12:12:22 -0000	1.5
@@ -83,7 +83,7 @@
 }
 
 static char *get_identifier(void) {
-  return "dxr3 without overlay video out";
+  return "DXR3/HW+ TV out";
 }
 
 static char *_vo_dxr3_names[] = { "dxr3", NULL };
@@ -123,7 +123,7 @@
 }
 
 static char *get_help(void) {
-  return "Video out plugin supporting dxr3/hw+ cards.\n";
+  return "Video out plugin supports DXR3/HW+ cards.\n";
 }
 
 static void receive_xine_event(toxine_t *tox, xine_event_t *event) {

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_x11.c	3 Jul 2002 09:03:17 -0000	1.6
+++ vo_x11.c	3 Jul 2002 12:12:23 -0000	1.7
@@ -298,7 +298,7 @@
       update_cursor_visibility(tox);
     }
 
-    sleep(1);
+    sleep(2);
   }
 
   pthread_exit(NULL);
@@ -652,11 +652,12 @@
   
   /* Wait for map. */
   
-  do  {
+  do {
     XMaskEvent(private->display, 
                StructureNotifyMask, 
                &xev) ;
-  } while (xev.type != MapNotify || xev.xmap.event != private->x11_drawable[private->fullscreen].video_window);
+  } while ((xev.type != MapNotify) || 
+	   (xev.xmap.event != private->x11_drawable[private->fullscreen].video_window));
   XFlush(private->display);
   
   XUnlockDisplay (private->display);
@@ -711,10 +712,8 @@
       tox->config->read(tox->config, tox->configfile);
     }
     
-    tox->video.driver     = xine_load_video_output_plugin(tox->config, 
-							  tox->video.name,
-							  VISUAL_TYPE_X11,
-							  (void *)&vis);
+    tox->video.driver = xine_load_video_output_plugin(tox->config, tox->video.name,
+						      VISUAL_TYPE_X11, (void *)&vis);
     
     if(tox->video.driver == NULL) {
       fprintf(stderr, "xine_load_video_output_plugin() failed to load '%s' driver.\n",
@@ -1014,7 +1013,7 @@
  */
 static char *get_help(void) {
   return 
-    "Video out plugin supporting Xv and Xshm X11 drivers.\n"
+    "Video out plugin supports Xv, Xshm, DXR3/H+ overlay and Vidix drivers.\n"
     "\tShortcuts are:\n"
     "\tf,F\t\tFullscreen toggle.\n";
 }
@@ -1039,6 +1038,7 @@
  */
 static void fullscreen(toxine_t *tox) {
   toggle_fullscreen(tox);
+  update_cursor_visibility(tox);
 }
 
 /*