syncing my local tree:

- removes w32codec syncshutdown hack
- vo_driver api changed to support drivers with persistent overlays. that
will break binary compatibility xine-lib/xine-ui (xine-ui needs to be
recompiled). in order to keep binary compatibility
overlay_begin/overlay_end must be added after redraw_needed.
- video_overlay cleanups
- fix a hard to trigger condition where redraw wouldn't happen (freeing
handles)

CVS patchset: 2427
CVS date: 2002/08/10 21:25:20

9 files changed, 36 insertions, 20 deletions

diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 7a75137c1..99e66522e 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_aa.c,v 1.24 2002/07/20 21:07:01 f1rmb Exp $
+ * $Id: video_out_aa.c,v 1.25 2002/08/10 21:25:20 miguelfreitas Exp $
  *
  * video_out_aa.c, ascii-art output plugin for xine
  *
@@ -275,7 +275,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->vo_driver.alloc_frame          = aa_alloc_frame ;
   this->vo_driver.update_frame_format  = aa_update_frame_format;
   this->vo_driver.display_frame        = aa_display_frame;
+  this->vo_driver.overlay_begin        = NULL;
   this->vo_driver.overlay_blend        = NULL;
+  this->vo_driver.overlay_end          = NULL;
   this->vo_driver.get_property         = aa_get_property;
   this->vo_driver.set_property         = aa_set_property;
   this->vo_driver.get_property_min_max = aa_get_property_min_max;
@@ -287,7 +289,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }    
 
 static vo_info_t vo_info_aa = {
-  5,
+  6,
   "aa",
   NULL,
   VISUAL_TYPE_AA,
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 9cb3b6947..9f8a9e1b9 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_directfb.c,v 1.12 2002/07/22 18:56:57 richwareham Exp $
+ * $Id: video_out_directfb.c,v 1.13 2002/08/10 21:25:20 miguelfreitas Exp $
  *
  * DirectFB based output plugin.
  * Rich Wareham <richwareham@users.sourceforge.net>
@@ -533,7 +533,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->vo_driver.get_capabilities     = directfb_get_capabilities;
   this->vo_driver.alloc_frame          = directfb_alloc_frame;
   this->vo_driver.update_frame_format  = directfb_update_frame_format;
+  this->vo_driver.overlay_begin        = NULL; /* not used */
   this->vo_driver.overlay_blend        = directfb_overlay_blend;
+  this->vo_driver.overlay_end          = NULL; /* not used */
   this->vo_driver.display_frame        = directfb_display_frame;
   this->vo_driver.get_property         = directfb_get_property;
   this->vo_driver.set_property         = directfb_set_property;
@@ -551,7 +553,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }
 
 static vo_info_t vo_info_directfb = {
-  5,
+  6,
   "DirectFB",
   NULL,
   VISUAL_TYPE_DFB,
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index fb37f295d..5848a5453 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_fb.c,v 1.13 2002/07/15 21:42:34 esnel Exp $
+ * $Id: video_out_fb.c,v 1.14 2002/08/10 21:25:20 miguelfreitas Exp $
  * 
  * video_out_fb.c, frame buffer xine driver by Miguel Freitas
  *
@@ -711,7 +711,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->vo_driver.get_capabilities     = fb_get_capabilities;
   this->vo_driver.alloc_frame          = fb_alloc_frame;
   this->vo_driver.update_frame_format  = fb_update_frame_format;
+  this->vo_driver.overlay_begin        = NULL; /* not used */
   this->vo_driver.overlay_blend        = fb_overlay_blend;
+  this->vo_driver.overlay_end          = NULL; /* not used */
   this->vo_driver.display_frame        = fb_display_frame;
   this->vo_driver.get_property         = fb_get_property;
   this->vo_driver.set_property         = fb_set_property;
@@ -877,7 +879,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }
 
 static vo_info_t vo_info_fb = {
-  5,
+  6,
   "fb",
   NULL,
   VISUAL_TYPE_FB,
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 5a06fbac4..c4ba278ef 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_opengl.c,v 1.15 2002/07/16 19:33:37 esnel Exp $
+ * $Id: video_out_opengl.c,v 1.16 2002/08/10 21:25:20 miguelfreitas Exp $
  * 
  * video_out_glut.c, glut based OpenGL rendering interface for xine
  * Matthias Hopf <mat@mshopf.de>
@@ -1077,7 +1077,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
     this->vo_driver.get_capabilities     = opengl_get_capabilities;
     this->vo_driver.alloc_frame          = opengl_alloc_frame;
     this->vo_driver.update_frame_format  = opengl_update_frame_format;
+    this->vo_driver.overlay_begin        = NULL; /* not used */
     this->vo_driver.overlay_blend        = opengl_overlay_blend;
+    this->vo_driver.overlay_end          = NULL; /* not used */
     this->vo_driver.display_frame        = opengl_display_frame;
     this->vo_driver.get_property         = opengl_get_property;
     this->vo_driver.set_property         = opengl_set_property;
@@ -1099,7 +1101,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }
 
 static vo_info_t vo_info_shm = {
-    5,
+    6,
     "OpenGL",
     NULL,
     VISUAL_TYPE_X11,
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 0ef1508a6..e111aafd8 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_sdl.c,v 1.10 2002/07/15 21:42:34 esnel Exp $
+ * $Id: video_out_sdl.c,v 1.11 2002/08/10 21:25:20 miguelfreitas Exp $
  * 
  * video_out_sdl.c, Simple DirectMedia Layer
  *
@@ -674,7 +674,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->vo_driver.get_capabilities     = sdl_get_capabilities;
   this->vo_driver.alloc_frame          = sdl_alloc_frame;
   this->vo_driver.update_frame_format  = sdl_update_frame_format;
+  this->vo_driver.overlay_begin        = NULL; /* not used */
   this->vo_driver.overlay_blend        = sdl_overlay_blend;
+  this->vo_driver.overlay_end          = NULL; /* not used */
   this->vo_driver.display_frame        = sdl_display_frame;
   this->vo_driver.get_property         = sdl_get_property;
   this->vo_driver.set_property         = sdl_set_property;
@@ -689,7 +691,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }
 
 static vo_info_t vo_info_sdl = {
-  5,
+  6,
   "sdl",
   NULL,
   VISUAL_TYPE_X11,
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 8fcb91e41..07ab6e82b 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_syncfb.c,v 1.73 2002/07/15 21:42:34 esnel Exp $
+ * $Id: video_out_syncfb.c,v 1.74 2002/08/10 21:25:20 miguelfreitas Exp $
  * 
  * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
  * 
@@ -1151,7 +1151,9 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
   this->vo_driver.get_capabilities     = syncfb_get_capabilities;
   this->vo_driver.alloc_frame          = syncfb_alloc_frame;
   this->vo_driver.update_frame_format  = syncfb_update_frame_format;
+  this->vo_driver.overlay_begin        = NULL; /* not used */
   this->vo_driver.overlay_blend        = syncfb_overlay_blend;
+  this->vo_driver.overlay_end          = NULL; /* not used */
   this->vo_driver.display_frame        = syncfb_display_frame;
   this->vo_driver.get_property         = syncfb_get_property;
   this->vo_driver.set_property         = syncfb_set_property;
@@ -1164,7 +1166,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
 }
 
 static vo_info_t vo_info_syncfb = {
-  5,
+  6,
   "SyncFB",
   NULL,
   VISUAL_TYPE_X11,
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 92e29bd7c..c3e8380fa 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_vidix.c,v 1.7 2002/07/15 21:42:34 esnel Exp $
+ * $Id: video_out_vidix.c,v 1.8 2002/08/10 21:25:20 miguelfreitas Exp $
  * 
  * video_out_vidix.c
  *
@@ -842,12 +842,12 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->gui_width         = window_attributes.width;
   this->gui_height        = window_attributes.height;
 
-  
-  
   this->vo_driver.get_capabilities     = vidix_get_capabilities;
   this->vo_driver.alloc_frame          = vidix_alloc_frame;
   this->vo_driver.update_frame_format  = vidix_update_frame_format;
+  this->vo_driver.overlay_begin        = NULL; /* not used */
   this->vo_driver.overlay_blend        = vidix_overlay_blend;
+  this->vo_driver.overlay_end          = NULL; /* not used */
   this->vo_driver.display_frame        = vidix_display_frame;
   this->vo_driver.get_property         = vidix_get_property;
   this->vo_driver.set_property         = vidix_set_property;
@@ -861,7 +861,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }
 
 static vo_info_t vo_info_vidix = {
-  5,
+  6,
   "vidix",
   NULL,
   VISUAL_TYPE_X11,
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 55f78da14..fcc4a4089 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xshm.c,v 1.82 2002/07/30 00:26:45 miguelfreitas Exp $
+ * $Id: video_out_xshm.c,v 1.83 2002/08/10 21:25:20 miguelfreitas Exp $
  * 
  * video_out_xshm.c, X11 shared memory extension interface for xine
  *
@@ -1308,7 +1308,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->vo_driver.get_capabilities     = xshm_get_capabilities;
   this->vo_driver.alloc_frame          = xshm_alloc_frame;
   this->vo_driver.update_frame_format  = xshm_update_frame_format;
+  this->vo_driver.overlay_begin        = NULL; /* not used */
   this->vo_driver.overlay_blend        = xshm_overlay_blend;
+  this->vo_driver.overlay_end          = NULL; /* not used */
   this->vo_driver.display_frame        = xshm_display_frame;
   this->vo_driver.get_property         = xshm_get_property;
   this->vo_driver.set_property         = xshm_set_property;
@@ -1451,7 +1453,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }
 
 static vo_info_t vo_info_shm = {
-  5,                /* interface version */
+  6,                /* interface version */
   "XShm",           /* id                */
   NULL,
   VISUAL_TYPE_X11,  /* visual_type       */
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index cafc6007c..0ea7b1919 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xv.c,v 1.124 2002/07/20 21:46:06 esnel Exp $
+ * $Id: video_out_xv.c,v 1.125 2002/08/10 21:25:20 miguelfreitas Exp $
  * 
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -1360,7 +1360,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->vo_driver.get_capabilities     = xv_get_capabilities;
   this->vo_driver.alloc_frame          = xv_alloc_frame;
   this->vo_driver.update_frame_format  = xv_update_frame_format;
+  this->vo_driver.overlay_begin        = NULL; /* not used */
   this->vo_driver.overlay_blend        = xv_overlay_blend;
+  this->vo_driver.overlay_end          = NULL; /* not used */
   this->vo_driver.display_frame        = xv_display_frame;
   this->vo_driver.get_property         = xv_get_property;
   this->vo_driver.set_property         = xv_set_property;
@@ -1494,7 +1496,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 }
 
 static vo_info_t vo_info_xv = {
-  5,
+  6,
   "Xv",
   NULL,
   VISUAL_TYPE_X11,