[Toxine-cvs] CVS: toxine/src/plugins vo_none.c,1.8,1.9 vo_x11.c,1.20,1.21

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

Update of /cvsroot/toxine/toxine/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv14886/plugins

Modified Files:
	vo_none.c vo_x11.c 
Log Message:
@@first displayed frames

Index: vo_none.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_none.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_none.c	17 Jan 2003 23:39:59 -0000	1.8
+++ vo_none.c	18 Jan 2003 17:01:28 -0000	1.9
@@ -32,9 +32,10 @@
 static void init_video_out(toxine_t *tox) {
   toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
   none_private_t     *private = (none_private_t *) vop->private;
-
-  tox->video.port = xine_open_video_driver(tox->xine, tox->video.name, 0, (void *)NULL);
-
+  
+  tox->video.port = xine_open_video_driver(tox->xine, tox->video.name, XINE_VISUAL_TYPE_NONE, 
+					   (void *)NULL);
+  
   private->init = 1;
   
   if(tox->video.port == NULL) {

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_x11.c	17 Jan 2003 23:40:00 -0000	1.20
+++ vo_x11.c	18 Jan 2003 17:01:28 -0000	1.21
@@ -252,7 +252,7 @@
 	 private->x11_drawable[private->fullscreen].y);
 #endif
   
-  if(tox->video.port && (tox->xine_state & XINE_INIT))
+  if(tox->video.port && (tox->xine_state & XINE_STREAM))
     xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_DRAWABLE_CHANGED, 
 			  (void*) private->x11_drawable[private->fullscreen].video_window);
 
@@ -288,7 +288,7 @@
   x11_private_t      *private = (x11_private_t *) vop->private;
   int                 screensaver_timer = 0;
   
-  while(!(tox->xine_state & XINE_INIT))
+  while(!(tox->xine_state & XINE_STREAM))
     usec_sleep(100000);
   
   while(tox->video.running) {
@@ -335,7 +335,7 @@
   rect.w = 0;
   rect.h = 0;
   
-  if(tox->video.port && (tox->xine_state & XINE_INIT) &&
+  if(tox->video.port && (tox->xine_state & XINE_STREAM) &&
      (xine_gui_send_vo_data(tox->stream, 
 			    XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*)&rect) != -1)) {
     /* driver implements gui->video coordinate space translation, use it */
@@ -454,7 +454,7 @@
   x11_private_t        *private = (x11_private_t *) vop->private;
 
   XLockDisplay (private->display);
-  if(tox->video.port && (tox->xine_state & XINE_INIT)) {
+  if(tox->video.port && (tox->xine_state & XINE_STREAM)) {
     xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_SELECT_VISUAL, (void *)&vinfo);
     if(vinfo != (XVisualInfo *) -1) {
       if(!vinfo) {
@@ -816,7 +816,7 @@
 
       case XK_BackSpace:
 	/* speed == * 1 */
-	if(tox->xine_state & XINE_INIT) {
+	if(tox->xine_state & XINE_STREAM) {
 	  if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) != XINE_SPEED_NORMAL)
 	    xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
 	}
@@ -824,7 +824,7 @@
 
       case XK_Up:
 	/* speed++ */
-	if(tox->xine_state & XINE_INIT) {
+	if(tox->xine_state & XINE_STREAM) {
 	  if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) < XINE_SPEED_FAST_4) {
 	    if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) > XINE_SPEED_PAUSE)
 	      xine_set_param(tox->stream, XINE_PARAM_SPEED, 
@@ -837,7 +837,7 @@
 	
       case XK_Down:
 	/* speed-- */
-	if(tox->xine_state & XINE_INIT) {
+	if(tox->xine_state & XINE_STREAM) {
 	  if((xine_get_param(tox->stream, XINE_PARAM_SPEED)) > XINE_SPEED_PAUSE)
 	    xine_set_param(tox->stream, XINE_PARAM_SPEED, 
 			   ((xine_get_param(tox->stream, XINE_PARAM_SPEED)) / 2));
@@ -845,7 +845,7 @@
 	break;
 	
       case XK_space:
-	if(tox->xine_state & XINE_INIT) {
+	if(tox->xine_state & XINE_STREAM) {
 	  if(xine_get_param(tox->stream, XINE_PARAM_SPEED) != XINE_SPEED_PAUSE)
 	    xine_set_param(tox->stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
 	  else
@@ -869,7 +869,7 @@
 
     /* printf("Mouse event:mx=%d my=%d\n",mevent->x, mevent->y); */
     
-    if((tox->xine_state & XINE_INIT) && 
+    if((tox->xine_state & XINE_STREAM) && 
        (video_window_translate_point(tox, vop, mevent->x, mevent->y, &x, &y))) {
 
       event.type        = XINE_EVENT_INPUT_MOUSE_MOVE;
@@ -897,7 +897,7 @@
     }
 
     if(bevent->button == Button1) {
-      if((tox->xine_state & XINE_INIT) && 
+      if((tox->xine_state & XINE_STREAM) && 
 	 (video_window_translate_point(tox, vop, bevent->x, bevent->y, &x, &y))) {
 
 	event.type        = XINE_EVENT_INPUT_MOUSE_BUTTON;
@@ -920,7 +920,7 @@
     if (xevent->count == 0) {
       
       if((xev->xany.window == private->x11_drawable[private->fullscreen].video_window)
-	 && tox->video.port && (tox->xine_state & XINE_INIT))
+	 && tox->video.port && (tox->xine_state & XINE_STREAM))
 	xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_EXPOSE_EVENT, (void *)xev);
       
     }
@@ -951,7 +951,8 @@
     
   }
 
-  if((xev->type == private->completion_event) && tox->video.port && (tox->xine_state & XINE_INIT))
+  if((xev->type == private->completion_event) 
+     && tox->video.port && (tox->xine_state & XINE_STREAM))
     xine_gui_send_vo_data(tox->stream, XINE_GUI_SEND_COMPLETION_EVENT, (void *)xev);
   
 }