[Mplayer-cvslog] CVS: main/libvo vo_fbdev.c,1.52,1.53 vo_vesa.c,1.55,1.56 vo_xvidix.c,1.6,1.7 vosub_vidix.c,1.8,1.9 vosub_vidix.h,1.2,1.3

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv11226

Modified Files:
	vo_fbdev.c vo_vesa.c vo_xvidix.c vosub_vidix.c vosub_vidix.h 
Log Message:
added vidix_start() and vidix_stop() for better runtime-resize support ;)

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vo_fbdev.c	11 Jan 2002 17:20:43 -0000	1.52
+++ vo_fbdev.c	16 Jan 2002 15:22:45 -0000	1.53
@@ -1105,7 +1105,7 @@
 		    return -1;
 		}
 		else printf(FBDEV "Using VIDIX\n");
-	    
+		vidix_start();
 	}
 	else
 #endif

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vo_vesa.c	11 Jan 2002 17:20:43 -0000	1.55
+++ vo_vesa.c	16 Jan 2002 15:22:45 -0000	1.56
@@ -928,6 +928,7 @@
 		    return -1;
 		  }
 		  else printf("vo_vesa: Using VIDIX\n");
+		  vidix_start();
 		}
 #endif
 	}

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_xvidix.c	16 Jan 2002 09:18:43 -0000	1.6
+++ vo_xvidix.c	16 Jan 2002 15:22:45 -0000	1.7
@@ -78,9 +78,9 @@
 	window_y = drwcY;
 	window_width = drwWidth;
 	window_height = drwHeight;
+
 	/* FIXME: implement runtime resize/move if possible, this way is very ugly! */
-	vidix_term();
-	vidix_preinit(vidix_name, &video_out_xvidix);
+	vidix_stop();
 	if (vidix_init(image_width, image_height, window_x, window_y,
 	    window_width, window_height, image_format, vo_depthonscreen, vo_screenwidth, vo_screenheight) != 0)
         {
@@ -89,9 +89,10 @@
 	    vidix_term();
 	    uninit();
     	    exit(1); /* !!! */
-	    x = window_width;
-	    y = window_height;
 	}
+	vidix_start();
+        x = window_width;
+        y = window_height;
     }
     
     mp_msg(MSGT_VO, MSGL_INFO, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n",

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vosub_vidix.c	13 Jan 2002 14:52:58 -0000	1.8
+++ vosub_vidix.c	16 Jan 2002 15:22:45 -0000	1.9
@@ -145,11 +145,6 @@
 		printf("vosub_vidix: Can't configure playback: %s\n",strerror(err));
 		return -1;
 	}
-	if((err=vdlPlaybackOn(vidix_handler))!=0)
-	{
-                printf("vosub_vidix: Can't start playback: %s\n",strerror(err));
-		return -1;
-	}
 
 	next_frame = 0;
 	vidix_mem =vidix_play.dga_addr;
@@ -159,10 +154,35 @@
 	return 0;  
 }
 
+void vidix_start(void)
+{
+    int err;
+
+    if((err=vdlPlaybackOn(vidix_handler))!=0)
+    {
+	printf("vosub_vidix: Can't start playback: %s\n",strerror(err));
+	return -1;
+    }
+    return 0;
+}
+
+void vidix_stop(void)
+{
+    int err;
+
+    if((err=vdlPlaybackOff(vidix_handler))!=0)
+    {
+	printf("vosub_vidix: Can't stop playback: %s\n",strerror(err));
+	return -1;
+    }
+    return 0;
+}
+
 void vidix_term( void )
 {
   if(verbose > 1) printf("vosub_vidix: vidix_term() was called\n");
-	vdlPlaybackOff(vidix_handler);
+//	vdlPlaybackOff(vidix_handler);
+	vidix_stop();
 	vdlClose(vidix_handler);
 }
 

Index: vosub_vidix.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vosub_vidix.h	10 Jan 2002 18:00:23 -0000	1.2
+++ vosub_vidix.h	16 Jan 2002 15:22:45 -0000	1.3
@@ -18,6 +18,8 @@
 		    unsigned dest_x,unsigned dest_y,unsigned dst_width,
 		    unsigned dst_height,unsigned format,unsigned dest_bpp,
 		    unsigned vid_w,unsigned vid_h);
+void	 vidix_start(void);
+void	 vidix_stop(void);
 void     vidix_term( void );
 uint32_t vidix_query_fourcc(unsigned fourcc);