[Toxine-cvs] CVS: toxine/src/plugins vo_x11.c,1.33,1.34

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

Update of /cvsroot/toxine/toxine/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24642/plugins

Modified Files:
	vo_x11.c 
Log Message:
@@fix watchdog and X11 vop. show all xine_play() calls.

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vo_x11.c	30 May 2004 23:22:39 -0000	1.33
+++ vo_x11.c	31 May 2004 20:37:06 -0000	1.34
@@ -257,10 +257,8 @@
 #endif
   
   if(tox->video.port && (tox->xine_state & XINE_STREAM)) {
-    start_watchdog(tox, "xine_gui_send_vo_data");
     xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_DRAWABLE_CHANGED, 
 			  (void*) private->x11_drawable[private->fullscreen].video_window);
-    stop_watchdog(tox);
     
   }
 
@@ -346,9 +344,7 @@
   if(tox->video.port && (tox->xine_state & XINE_STREAM)) {
     int result;
     
-    start_watchdog(tox, "xine_gui_send_vo_data");
     result = xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*)&rect);
-    stop_watchdog(tox);
     
     if(result != -1) {
       /* driver implements gui->video coordinate space translation, use it */
@@ -467,9 +463,7 @@
 
   XLockDisplay (private->display);
   if(tox->video.port && (tox->xine_state & XINE_STREAM)) {
-    start_watchdog(tox, "xine_gui_send_vo_data");
     xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_SELECT_VISUAL, (void *)&vinfo);
-    stop_watchdog(tox);
     if(vinfo != (XVisualInfo *) -1) {
       if(!vinfo) {
         perr("Output driver cannot select a working visual\n");
@@ -849,15 +843,11 @@
 	if(tox->xine_state & XINE_STREAM) {
 	  int speed;
 	  
-	  start_watchdog(tox, "xine_config_register_enum");
 	  speed = xine_get_param(tox->stream, XINE_PARAM_SPEED);
-	  stop_watchdog(tox);
 	  
-	  if(speed != XINE_SPEED_NORMAL) {
-	    start_watchdog(tox, "xine_set_param");
+	  if(speed != XINE_SPEED_NORMAL)
 	    xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
-	    stop_watchdog(tox);
-	  }
+
 	}
 	break;
 
@@ -866,26 +856,17 @@
 	if(tox->xine_state & XINE_STREAM) {
 	  int speed;
 	  
-	  start_watchdog(tox, "xine_get_param");
 	  speed = xine_get_param(tox->stream, XINE_PARAM_SPEED);
-	  stop_watchdog(tox);
 
 	  if(speed < XINE_SPEED_FAST_4) {
-	    start_watchdog(tox, "xine_get_param");
 	    speed = xine_get_param(tox->stream, XINE_PARAM_SPEED);
-	    stop_watchdog(tox);
 
-	    if(speed > XINE_SPEED_PAUSE) {
-	      start_watchdog(tox, "xine_get_param");
+	    if(speed > XINE_SPEED_PAUSE)
 	      speed = xine_get_param(tox->stream, XINE_PARAM_SPEED) * 2;
-	      stop_watchdog(tox);
-	    }
 	    else
 	      speed = XINE_SPEED_SLOW_4;
 	    
-	    start_watchdog(tox, "xine_set_param");
 	    xine_set_param(tox->stream, XINE_PARAM_SPEED, speed);
-	    stop_watchdog(tox);
 	  }
 	}
 	break;
@@ -895,19 +876,12 @@
 	if(tox->xine_state & XINE_STREAM) {
 	  int speed;
 
-	  start_watchdog(tox, "xine_get_param");
 	  speed = xine_get_param(tox->stream, XINE_PARAM_SPEED);
-	  stop_watchdog(tox);
 
 	  if(speed > XINE_SPEED_PAUSE) {
 	    
-	    start_watchdog(tox, "xine_get_param");
 	    speed = xine_get_param(tox->stream, XINE_PARAM_SPEED) / 2;
-	    stop_watchdog(tox);
-
-	    start_watchdog(tox, "xine_set_param");
 	    xine_set_param(tox->stream, XINE_PARAM_SPEED, speed);
-	    stop_watchdog(tox);
 	  }
 	}
 	break;
@@ -916,18 +890,14 @@
 	if(tox->xine_state & XINE_STREAM) {
 	  int speed;
 	  
-	  start_watchdog(tox, "xine_get_param");
 	  speed = xine_get_param(tox->stream, XINE_PARAM_SPEED);
-	  stop_watchdog(tox);
 
 	  if(speed != XINE_SPEED_PAUSE)
 	    speed = XINE_SPEED_PAUSE;
 	  else
 	    speed = XINE_SPEED_NORMAL;
 	  
-	  start_watchdog(tox, "xine_set_param");
 	  xine_set_param(tox->stream, XINE_PARAM_SPEED, speed);
-	  stop_watchdog(tox);
 	}
 	break;
       }
@@ -958,9 +928,7 @@
       input.button      = 0; /*  No buttons, just motion. */
       input.x           = x;
       input.y           = y;
-      start_watchdog(tox, "xine_event_send");
       xine_event_send(tox->stream, &event);
-      stop_watchdog(tox);
     }
   }
   break;
@@ -988,9 +956,7 @@
 	input.button      = 1;
 	input.x           = x;
 	input.y           = y;
-	start_watchdog(tox, "xine_event_send");
 	xine_event_send(tox->stream, &event);
-	stop_watchdog(tox);
       }
     }
   }
@@ -1002,11 +968,8 @@
     if (xevent->count == 0) {
       
       if((xev->xany.window == private->x11_drawable[private->fullscreen].video_window)
-	 && tox->video.port && (tox->xine_state & XINE_STREAM)) {
-	start_watchdog(tox, "xine_gui_send_vo_data");
+	 && tox->video.port && (tox->xine_state & XINE_STREAM))
 	xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_EXPOSE_EVENT, (void *)xev);
-	stop_watchdog(tox);
-      }
       
     }
   }