Replace copy member in vo_frame_t with proc_frame and proc_slice. Increase video_out API version to 18.

CVS patchset: 5574
CVS date: 2003/10/22 20:38:09

14 files changed, 117 insertions, 89 deletions

diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 9c0e9e05a..c845dfd00 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.37 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_aa.c,v 1.38 2003/10/22 20:38:10 komadori Exp $
  *
  * video_out_aa.c, ascii-art output plugin for xine
  *
@@ -109,7 +109,8 @@ static vo_frame_t *aa_alloc_frame(vo_driver_t *this) {
   frame = (aa_frame_t *) malloc (sizeof (aa_frame_t));
   memset (frame, 0, sizeof (aa_frame_t));
 
-  frame->vo_frame.copy = NULL;
+  frame->vo_frame.proc_slice = NULL;
+  frame->vo_frame.proc_frame = NULL;
   frame->vo_frame.field = aa_frame_field;
   frame->vo_frame.dispose = aa_dispose_frame;
   frame->vo_frame.driver = this;
@@ -328,6 +329,6 @@ static vo_info_t vo_info_aa = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_OUT, 17, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index a8282b5c5..ffb515f93 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.21 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_directfb.c,v 1.22 2003/10/22 20:38:10 komadori Exp $
  *
  * DirectFB based output plugin.
  * Rich Wareham <richwareham@users.sourceforge.net>
@@ -195,9 +195,10 @@ static vo_frame_t *directfb_alloc_frame (vo_driver_t *this_gen) {
    * supply required functions
    */
   
-  frame->vo_frame.copy    = NULL; 
-  frame->vo_frame.field   = directfb_frame_field; 
-  frame->vo_frame.dispose = directfb_frame_dispose;
+  frame->vo_frame.proc_slice = NULL; 
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = directfb_frame_field; 
+  frame->vo_frame.dispose    = directfb_frame_dispose;
 
   frame->surface = NULL;
   frame->locked = 0;
@@ -591,7 +592,7 @@ static vo_info_t vo_info_directfb = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_OUT, 17, "DirectFB", XINE_VERSION_CODE, &vo_info_directfb, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "DirectFB", XINE_VERSION_CODE, &vo_info_directfb, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index 1c514f518..7ae1d891b 100755
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -853,9 +853,10 @@ static vo_frame_t * win32_alloc_frame( vo_driver_t * vo_driver )
 	win32_frame = ( win32_frame_t * ) malloc( sizeof( win32_frame_t ) );
 	memset( win32_frame, 0, sizeof( win32_frame_t ) );
 
-	win32_frame->vo_frame.copy    = NULL;
-	win32_frame->vo_frame.field   = win32_frame_field;
-	win32_frame->vo_frame.dispose = win32_frame_dispose;
+	win32_frame->vo_frame.proc_slice = NULL;
+	win32_frame->vo_frame.proc_frame = NULL;
+	win32_frame->vo_frame.field      = win32_frame_field;
+	win32_frame->vo_frame.dispose    = win32_frame_dispose;
 	win32_frame->format = -1;
 
 	return ( vo_frame_t * ) win32_frame;
@@ -1262,6 +1263,6 @@ static vo_info_t vo_info_win32 = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_OUT, 17, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index ee65f19d0..931fe94ff 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.28 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_fb.c,v 1.29 2003/10/22 20:38:10 komadori Exp $
  * 
  * video_out_fb.c, frame buffer xine driver by Miguel Freitas
  *
@@ -149,13 +149,12 @@ typedef struct
 
 static uint32_t fb_get_capabilities(vo_driver_t *this_gen)
 {
-  return VO_CAP_COPIES_IMAGE |
-    VO_CAP_YV12         |
+  return VO_CAP_YV12    |
     VO_CAP_YUY2         |
     VO_CAP_BRIGHTNESS;
 }
 
-static void fb_frame_copy(vo_frame_t *vo_img, uint8_t **src)
+static void fb_frame_proc_slice(vo_frame_t *vo_img, uint8_t **src)
 {
   fb_frame_t *frame = (fb_frame_t *)vo_img ;
   
@@ -225,10 +224,11 @@ static vo_frame_t *fb_alloc_frame(vo_driver_t *this_gen)
   pthread_mutex_init(&frame->vo_frame.mutex, NULL);
   
   /* supply required functions */
-  frame->vo_frame.copy    = fb_frame_copy;
-  frame->vo_frame.field   = fb_frame_field; 
-  frame->vo_frame.dispose = fb_frame_dispose;
-  frame->vo_frame.driver  = this_gen;
+  frame->vo_frame.proc_slice = fb_frame_proc_slice;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = fb_frame_field; 
+  frame->vo_frame.dispose    = fb_frame_dispose;
+  frame->vo_frame.driver     = this_gen;
   
   frame->this = this;
   
@@ -1053,7 +1053,7 @@ plugin_info_t xine_plugin_info[] =
   /* type, API, "name", version, special_info, init_function */  
   {
     PLUGIN_VIDEO_OUT,
-    17,
+    18,
     "fb",
     XINE_VERSION_CODE,
     &vo_info_fb, fb_init_class
diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c
index 7d99713ea..371ffb295 100644
--- a/src/video_out/video_out_none.c
+++ b/src/video_out/video_out_none.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_none.c,v 1.16 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_none.c,v 1.17 2003/10/22 20:38:10 komadori Exp $
  *
  * Was originally part of toxine frontend.
  * ...but has now been adapted to xine coding style standards ;)
@@ -99,10 +99,11 @@ static vo_frame_t *none_alloc_frame(vo_driver_t *vo_driver) {
   frame->vo_frame.base[1] = NULL;
   frame->vo_frame.base[2] = NULL;
   
-  frame->vo_frame.copy    = NULL;
-  frame->vo_frame.field   = none_frame_field;
-  frame->vo_frame.dispose = none_frame_dispose;
-  frame->vo_frame.driver  = vo_driver;
+  frame->vo_frame.proc_slice = NULL;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = none_frame_field;
+  frame->vo_frame.dispose    = none_frame_dispose;
+  frame->vo_frame.driver     = vo_driver;
   
   return (vo_frame_t *)frame;
 }
@@ -302,6 +303,6 @@ static vo_info_t vo_info_none = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_OUT, 17, "none", XINE_VERSION_CODE, &vo_info_none, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "none", XINE_VERSION_CODE, &vo_info_none, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index f2282eaf5..1ae5534de 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.28 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_opengl.c,v 1.29 2003/10/22 20:38:10 komadori Exp $
  * 
  * video_out_glut.c, glut based OpenGL rendering interface for xine
  * Matthias Hopf <mat@mshopf.de>
@@ -189,11 +189,11 @@ enum { CONTEXT_BAD = 0, CONTEXT_SAME_DRAWABLE, CONTEXT_RELOAD, CONTEXT_SET };
 
 
 static uint32_t opengl_get_capabilities (vo_driver_t *this_gen) {
-    return VO_CAP_COPIES_IMAGE | VO_CAP_YV12 | VO_CAP_YUY2 | VO_CAP_BRIGHTNESS;
+    return VO_CAP_YV12 | VO_CAP_YUY2 | VO_CAP_BRIGHTNESS;
 }
 
 
-static void opengl_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
+static void opengl_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
     opengl_frame_t  *frame = (opengl_frame_t *) vo_img ;
   
     vo_img->copy_called = 1;
@@ -285,10 +285,11 @@ static vo_frame_t *opengl_alloc_frame (vo_driver_t *this_gen) {
     /*
      * supply required functions/fields
      */
-    frame->vo_frame.copy    = opengl_frame_copy;
-    frame->vo_frame.field   = opengl_frame_field; 
-    frame->vo_frame.dispose = opengl_frame_dispose;
-    frame->vo_frame.driver  = this_gen;
+    frame->vo_frame.proc_slice = opengl_frame_proc_slice;
+    frame->vo_frame.proc_frame = opengl_frame_proc_frame;
+    frame->vo_frame.field      = opengl_frame_field; 
+    frame->vo_frame.dispose    = opengl_frame_dispose;
+    frame->vo_frame.driver     = this_gen;
   
     /*
      * colorspace converter for this frame
@@ -1000,7 +1001,7 @@ static vo_info_t vo_info_opengl = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_OUT, 17, "opengl", XINE_VERSION_CODE,
+  { PLUGIN_VIDEO_OUT, 18, "opengl", XINE_VERSION_CODE,
     &vo_info_opengl, opengl_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index e7a33edfe..0e6a8ecf6 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.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_pgx64.c,v 1.40 2003/10/19 03:12:47 komadori Exp $
+ * $Id: video_out_pgx64.c,v 1.41 2003/10/22 20:38:10 komadori Exp $
  *
  * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine
  *
@@ -267,7 +267,18 @@ static int vram_alloc(pgx64_driver_t* this, int size)
  * XINE VIDEO DRIVER FUNCTIONS
  */
 
-static void pgx64_frame_copy(pgx64_frame_t *frame, uint8_t **src)
+static void pgx64_frame_proc_frame(pgx64_frame_t *frame, uint8_t **src)
+{
+  int i;
+
+  frame->vo_frame.copy_called = 1;
+
+  for (i=0; i<frame->planes; i++) {
+    memcpy(frame->buffer_ptrs[i], src[i], frame->lengths[i]);
+  }
+}
+
+static void pgx64_frame_proc_slice(pgx64_frame_t *frame, uint8_t **src)
 {
   int i, len;
 
@@ -280,6 +291,8 @@ static void pgx64_frame_copy(pgx64_frame_t *frame, uint8_t **src)
   }
 }
 
+
+
 static void pgx64_frame_field(pgx64_frame_t *frame, int which_field)
 {
 }
@@ -292,8 +305,7 @@ static void pgx64_frame_dispose(pgx64_frame_t *frame)
 
 static uint32_t pgx64_get_capabilities(pgx64_driver_t *this)
 {
-  return VO_CAP_COPIES_IMAGE |
-         VO_CAP_YV12 |
+  return VO_CAP_YV12 |
          VO_CAP_YUY2 |
          VO_CAP_COLORKEY |
          VO_CAP_SATURATION |
@@ -313,9 +325,10 @@ static pgx64_frame_t* pgx64_alloc_frame(pgx64_driver_t *this)
 
   pthread_mutex_init(&frame->vo_frame.mutex, NULL);
 
-  frame->vo_frame.copy    = NULL; 
-  frame->vo_frame.field   = (void*)pgx64_frame_field; 
-  frame->vo_frame.dispose = (void*)pgx64_frame_dispose;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.proc_slice = NULL;
+  frame->vo_frame.field      = (void*)pgx64_frame_field;
+  frame->vo_frame.dispose    = (void*)pgx64_frame_dispose;
 
   return frame;
 }
@@ -334,7 +347,8 @@ static void pgx64_update_frame_format(pgx64_driver_t *this, pgx64_frame_t *frame
     frame->format = format;
     frame->pitch = ((width + 7) / 8) * 8;
 
-    frame->vo_frame.copy = NULL; 
+    frame->vo_frame.proc_frame = NULL; 
+    frame->vo_frame.proc_slice = NULL; 
 
     switch (format) {
       case XINE_IMGFMT_YUY2:
@@ -435,7 +449,7 @@ static void pgx64_display_frame(pgx64_driver_t *this, pgx64_frame_t *frame)
   if (this->buf_mode == BUF_MODE_MULTI) {
     int i;
 
-    if (frame->vo_frame.copy != (void*)pgx64_frame_copy) {
+    if (frame->vo_frame.proc_slice != (void*)pgx64_frame_proc_slice) {
       for (i=0; i<frame->planes; i++) {
         if ((frame->buffers[i] = vram_alloc(this, frame->lengths[i])) < 0) {
           if (this->detained_frames < MAX_DETAINED_FRAMES) {
@@ -455,7 +469,8 @@ static void pgx64_display_frame(pgx64_driver_t *this, pgx64_frame_t *frame)
         }
       }
 
-      frame->vo_frame.copy = (void*)pgx64_frame_copy;
+      frame->vo_frame.proc_frame = (void*)pgx64_frame_proc_frame;
+      frame->vo_frame.proc_slice = (void*)pgx64_frame_proc_slice;
     }
 
     for (i=0; i<frame->planes; i++) {
@@ -506,7 +521,8 @@ static void pgx64_display_frame(pgx64_driver_t *this, pgx64_frame_t *frame)
       memcpy(this->buffer_ptrs[this->dblbuf_select][i], frame->vo_frame.base[i], frame->lengths[i]);
     }
 
-    frame->vo_frame.copy = NULL;
+    frame->vo_frame.proc_slice = NULL;
+    frame->vo_frame.proc_frame = NULL;
   }
 
   this->vregs[CAPTURE_CONFIG] = this->dblbuf_select ? le2me_32(CAPTURE_CONFIG_BUF1) : le2me_32(CAPTURE_CONFIG_BUF0);
@@ -522,7 +538,7 @@ static void pgx64_display_frame(pgx64_driver_t *this, pgx64_frame_t *frame)
 static void pgx64_overlay_blend(pgx64_driver_t *this, pgx64_frame_t *frame, vo_overlay_t *overlay)
 {
   if (overlay->rle) {
-    if (frame->vo_frame.copy == (void*)pgx64_frame_copy) {
+    if (frame->vo_frame.proc_slice == (void*)pgx64_frame_proc_slice) {
       /* FIXME: Implement out of place alphablending functions for better performance */
       switch (frame->format) {
         case XINE_IMGFMT_YV12: {
@@ -1074,6 +1090,6 @@ static pgx64_driver_class_t* pgx64_init_class(xine_t *xine, void *visual_gen)
 }
 
 plugin_info_t xine_plugin_info[] = {
-  {PLUGIN_VIDEO_OUT, 17, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, (void*)pgx64_init_class},
+  {PLUGIN_VIDEO_OUT, 18, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, (void*)pgx64_init_class},
   {PLUGIN_NONE, 0, "", 0, NULL, NULL}
 };
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 50ff3753f..5c5af63ad 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.27 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_sdl.c,v 1.28 2003/10/22 20:38:10 komadori Exp $
  *
  * video_out_sdl.c, Simple DirectMedia Layer
  *
@@ -146,9 +146,10 @@ static vo_frame_t *sdl_alloc_frame (vo_driver_t *this_gen) {
    * supply required functions
    */
 
-  frame->vo_frame.copy    = NULL;
-  frame->vo_frame.field   = sdl_frame_field;
-  frame->vo_frame.dispose = sdl_frame_dispose;
+  frame->vo_frame.proc_slice = NULL;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = sdl_frame_field;
+  frame->vo_frame.dispose    = sdl_frame_dispose;
 
   return (vo_frame_t *) frame;
 }
@@ -596,6 +597,6 @@ static vo_info_t vo_info_sdl = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_OUT, 17, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class },
   { PLUGIN_NONE, 0, "" , 0 , NULL, NULL}
 };
diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c
index 7a9aa093b..6f034d98c 100644
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.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_stk.c,v 1.5 2003/10/07 17:35:51 miguelfreitas Exp $
+ * $Id: video_out_stk.c,v 1.6 2003/10/22 20:38:10 komadori Exp $
  *
  * video_out_stk.c, Libstk Surface Video Driver
  * more info on Libstk at http://www.libstk.org
@@ -105,7 +105,7 @@ static uint32_t stk_get_capabilities (vo_driver_t *this_gen) {
 }
 
 /* copy YUV to RGB data (see fb driver)*/
-static void stk_frame_copy (vo_frame_t *vo_img, uint8_t **src)
+static void stk_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src)
 {
     /* not needed by SDL, we may need it for other stk backends */
     //printf("video_out_stk: frame_copy()\n");
@@ -138,9 +138,10 @@ static vo_frame_t *stk_alloc_frame(vo_driver_t *this_gen) {
     pthread_mutex_init (&frame->vo_frame.mutex, NULL);
 
     /* map the frame function pointers */
-    frame->vo_frame.copy    = stk_frame_copy;
-    frame->vo_frame.field   = stk_frame_field;
-    frame->vo_frame.dispose = stk_frame_dispose;
+    frame->vo_frame.proc_slice = stk_frame_proc_slice;
+    frame->vo_frame.proc_frame = NULL;
+    frame->vo_frame.field      = stk_frame_field;
+    frame->vo_frame.dispose    = stk_frame_dispose;
 
     return (vo_frame_t *) frame;
 }
@@ -477,7 +478,7 @@ static vo_info_t vo_info_stk = {
 
 plugin_info_t xine_plugin_info[] = {
     /* type, API, "name", version, special_info, init_function */
-    { PLUGIN_VIDEO_OUT, 17, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class },
+    { PLUGIN_VIDEO_OUT, 18, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class },
     { PLUGIN_NONE, 0, "" , 0 , NULL, NULL}
 };
 
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 32376315d..9a7ba581e 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.89 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_syncfb.c,v 1.90 2003/10/22 20:38:10 komadori Exp $
  * 
  * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
  * 
@@ -486,9 +486,10 @@ static vo_frame_t* syncfb_alloc_frame(vo_driver_t* this_gen)
     /*
      * supply required functions
      */
-    frame->vo_frame.copy    = NULL;
-    frame->vo_frame.field   = syncfb_frame_field;
-    frame->vo_frame.dispose = syncfb_frame_dispose;
+    frame->vo_frame.proc_slice = NULL;
+    frame->vo_frame.proc_frame = NULL;
+    frame->vo_frame.field      = syncfb_frame_field;
+    frame->vo_frame.dispose    = syncfb_frame_dispose;
 
     frame->vo_frame.driver  = this_gen;
   }
@@ -1057,7 +1058,7 @@ static vo_info_t vo_info_syncfb = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_OUT, 17, "SyncFB", XINE_VERSION_CODE, &vo_info_syncfb, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "SyncFB", XINE_VERSION_CODE, &vo_info_syncfb, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index b7017c233..356d5278b 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.47 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_vidix.c,v 1.48 2003/10/22 20:38:10 komadori Exp $
  * 
  * video_out_vidix.c
  *
@@ -402,9 +402,10 @@ static vo_frame_t *vidix_alloc_frame (vo_driver_t *this_gen) {
    * supply required functions
    */
 
-  frame->vo_frame.copy    = NULL;
-  frame->vo_frame.field   = vidix_frame_field;
-  frame->vo_frame.dispose = vidix_frame_dispose;
+  frame->vo_frame.proc_slice = NULL;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = vidix_frame_field;
+  frame->vo_frame.dispose    = vidix_frame_dispose;
 
   return (vo_frame_t *) frame;
 }
@@ -1233,10 +1234,10 @@ static vo_info_t vo_info_vidixfb = {
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
 #ifdef HAVE_X11
-  { PLUGIN_VIDEO_OUT, 17, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class },
+  { PLUGIN_VIDEO_OUT, 18, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class },
 #endif
 #ifdef HAVE_FB
-  { PLUGIN_VIDEO_OUT, 17, "vidixfb", XINE_VERSION_CODE, &vo_info_vidixfb, vidixfb_init_class },
+  { PLUGIN_VIDEO_OUT, 18, "vidixfb", XINE_VERSION_CODE, &vo_info_vidixfb, vidixfb_init_class },
 #endif
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 895606b05..f6c17cd1a 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.115 2003/10/18 23:01:21 f1rmb Exp $
+ * $Id: video_out_xshm.c,v 1.116 2003/10/22 20:38:10 komadori Exp $
  * 
  * video_out_xshm.c, X11 shared memory extension interface for xine
  *
@@ -307,11 +307,11 @@ static void dispose_ximage (xshm_driver_t *this,
  */
 
 static uint32_t xshm_get_capabilities (vo_driver_t *this_gen) {
-  return VO_CAP_COPIES_IMAGE | VO_CAP_YV12 | VO_CAP_YUY2 |
+  return VO_CAP_YV12 | VO_CAP_YUY2 |
 	 VO_CAP_BRIGHTNESS | VO_CAP_CONTRAST | VO_CAP_SATURATION;
 }
 
-static void xshm_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
+static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
   xshm_frame_t  *frame = (xshm_frame_t *) vo_img ;
   /*xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
 
@@ -390,10 +390,11 @@ static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) {
    * supply required functions/fields
    */
   
-  frame->vo_frame.copy    = xshm_frame_copy;
-  frame->vo_frame.field   = xshm_frame_field; 
-  frame->vo_frame.dispose = xshm_frame_dispose;
-  frame->vo_frame.driver  = this_gen;
+  frame->vo_frame.proc_slice = xshm_frame_proc_slice;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = xshm_frame_field; 
+  frame->vo_frame.dispose    = xshm_frame_dispose;
+  frame->vo_frame.driver     = this_gen;
 
   /*
    * colorspace converter for this frame
@@ -1229,6 +1230,6 @@ static vo_info_t vo_info_xshm = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_OUT, 17, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class },
+  { PLUGIN_VIDEO_OUT, 18, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 2fc804b92..316c63eab 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.176 2003/10/18 23:01:21 f1rmb Exp $
+ * $Id: video_out_xv.c,v 1.177 2003/10/22 20:38:10 komadori Exp $
  *
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -207,10 +207,11 @@ static vo_frame_t *xv_alloc_frame (vo_driver_t *this_gen) {
   /*
    * supply required functions
    */
-  frame->vo_frame.copy    = NULL;
-  frame->vo_frame.field   = xv_frame_field;
-  frame->vo_frame.dispose = xv_frame_dispose;
-  frame->vo_frame.driver  = this_gen;
+  frame->vo_frame.proc_slice = NULL;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = xv_frame_field;
+  frame->vo_frame.dispose    = xv_frame_dispose;
+  frame->vo_frame.driver     = this_gen;
 
   return (vo_frame_t *) frame;
 }
@@ -1466,7 +1467,7 @@ static vo_info_t vo_info_xv = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_OUT, 17, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 2a3a642b1..e1e6aa2f3 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.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_xvmc.c,v 1.2 2003/10/06 21:52:44 miguelfreitas Exp $
+ * $Id: video_out_xvmc.c,v 1.3 2003/10/22 20:38:10 komadori Exp $
  * 
  * video_out_xvmc.c, X11 video motion compensation extension interface for xine
  *
@@ -623,9 +623,10 @@ static vo_frame_t *xvmc_alloc_frame (vo_driver_t *this_gen) {
    * supply required functions
    */
 
-  frame->vo_frame.copy    = NULL;
-  frame->vo_frame.field   = xvmc_frame_field;
-  frame->vo_frame.dispose = xvmc_frame_dispose;
+  frame->vo_frame.proc_slice = NULL;
+  frame->vo_frame.proc_frame = NULL;
+  frame->vo_frame.field      = xvmc_frame_field;
+  frame->vo_frame.dispose    = xvmc_frame_dispose;
   frame->vo_frame.proc_macro_block = xvmc_proc_macro_block;
 
   frame->vo_frame.driver  = this_gen;
@@ -1901,7 +1902,7 @@ static vo_info_t vo_info_xvmc = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_OUT, 17, "xvmc", XINE_VERSION_CODE, &vo_info_xvmc, init_class },
+  { PLUGIN_VIDEO_OUT, 18, "xvmc", XINE_VERSION_CODE, &vo_info_xvmc, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };