1 files changed, 7 insertions, 7 deletions

diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index f28fba3..90f62f2 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -103,33 +103,33 @@ struct opie_frame_s {
   yuv2rgb_t         *yuv2rgb;
   uint8_t           *rgb_dst;
   int                yuv_stride;
   int                stripe_height, stripe_inc;
   
   null_driver_t     *output;
 };
 
 static uint32_t null_get_capabilities( vo_driver_t *self ){   
   null_driver_t* this = (null_driver_t*)self;
   return this->m_capabilities;
 }
 
 static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
   opie_frame_t  *frame = (opie_frame_t *) vo_img ;
  
-  vo_img->copy_called = 1;
+  vo_img->proc_called = 1;
 
   if (!frame->output->m_show_video) { 
     /* printf("nullvideo: no video\n");  */
     return; 
   } 
 
   if (frame->format == XINE_IMGFMT_YV12) {
     frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst,
          src[0], src[1], src[2]);
   } else {
 
     frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
           src[0]);
   } 
   
   frame->rgb_dst += frame->stripe_inc; 
@@ -173,71 +173,71 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
 
 #ifdef LOG  
   fprintf (stderr, "nullvideo: alloc_frame\n");
 #endif  
 
   frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
   
   memset( frame, 0, sizeof( opie_frame_t) );
   memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t));
   
   pthread_mutex_init (&frame->frame.mutex, NULL);
   
   frame->output = this;
   
   /* initialize the frame*/
   frame->frame.driver = self;
-  frame->frame.copy = null_frame_copy;
+  frame->frame.proc_slice = null_frame_copy;
   frame->frame.field = null_frame_field;
   frame->frame.dispose = null_frame_dispose;
   
   /*
    *    colorspace converter for this frame
    */   
   frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory);
   
   return (vo_frame_t*) frame;
 }
 
 static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
               uint32_t width, uint32_t height,
-              int ratio_code,  int format, int flags ){
+              double ratio_code,  int format, int flags ){
   null_driver_t* this = (null_driver_t*) self;
   opie_frame_t*  frame = (opie_frame_t*)img;
   /* not needed now */
 
 #ifdef LOG
   fprintf (stderr, "nullvideo: update_frame_format\n");
 #endif
 
   flags &= VO_BOTH_FIELDS;
 
   /* find out if we need to adapt this frame */
 
   if ((width != frame->sc.delivered_width)
       || (height != frame->sc.delivered_height)
-      || (ratio_code != frame->sc.delivered_ratio_code)
+      || (ratio_code != frame->sc.delivered_ratio)
       || (flags != frame->flags)
       || (format != frame->format)
       || (this->sc.user_ratio != frame->sc.user_ratio)
       || (this->gui_width != frame->sc.gui_width)
       || (this->gui_height != frame->sc.gui_height)) {
 
     frame->sc.delivered_width      = width;
     frame->sc.delivered_height     = height;
-    frame->sc.delivered_ratio_code = ratio_code;
+    frame->sc.delivered_ratio      = ratio_code;
     frame->flags                   = flags;
     frame->format                  = format;
     frame->sc.user_ratio           = this->sc.user_ratio;
     frame->sc.gui_width            = this->gui_width;
     frame->sc.gui_height           = this->gui_height;
     frame->sc.gui_pixel_aspect     = 1.0;
 
     vo_scale_compute_ideal_size ( &frame->sc );
     vo_scale_compute_output_size( &frame->sc );
 
 #ifdef LOG  
     fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n",
        frame->sc.gui_width, frame->sc.gui_height,
        frame->sc.delivered_width, frame->sc.delivered_height,
        frame->sc.output_width, frame->sc.output_height);
 #endif
@@ -342,33 +342,33 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
 }
 
 static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){   
   null_driver_t* this = (null_driver_t*) self;
   opie_frame_t* frame = (opie_frame_t*)frame_gen;
   display_xine_frame_t display = this->frameDis;
   
   if (!this->m_show_video) 
     return;
 
   if( display != NULL ) {
     (*display)(this->caller, frame->data,
          frame->sc.output_width, frame->sc.output_height,
          frame->bytes_per_line );
   }
   
-  frame->frame.displayed (&frame->frame);
+  frame->frame.free(&frame->frame);
 }
 
 
 /* blending related */
 static void null_overlay_clut_yuv2rgb (null_driver_t  *this, 
                vo_overlay_t *overlay,
                opie_frame_t *frame) {
   int i;
   clut_t* clut = (clut_t*) overlay->color;
   if (!overlay->rgb_clut) {
     for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) {
       *((uint32_t *)&clut[i]) =
   frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb,
               clut[i].y, clut[i].cb, clut[i].cr);
     }
     overlay->rgb_clut++;
@@ -473,33 +473,33 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
 
   /* install callback handlers*/
   vo->vo_driver.get_capabilities      = null_get_capabilities;
   vo->vo_driver.alloc_frame           = null_alloc_frame;
   vo->vo_driver.update_frame_format   = null_update_frame_format;
   vo->vo_driver.display_frame         = null_display_frame;
   vo->vo_driver.overlay_blend         = null_overlay_blend;
   vo->vo_driver.get_property          = null_get_property;
   vo->vo_driver.set_property          = null_set_property;
   vo->vo_driver.get_property_min_max  = null_get_property_min_max;
   vo->vo_driver.gui_data_exchange     = null_gui_data_exchange;
   vo->vo_driver.dispose               = null_dispose;
   vo->vo_driver.redraw_needed         = null_redraw_needed;
     
 
   /* capabilities */
-  vo->m_capabilities = VO_CAP_COPIES_IMAGE | VO_CAP_YUY2 | VO_CAP_YV12;
+  vo->m_capabilities = /* VO_CAP_COPIES_IMAGE | */ VO_CAP_YUY2 | VO_CAP_YV12;
   vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, 
                 vo->yuv2rgb_cmap);
 
   vo->caller = userData;
   vo->frameDis = frameDisplayFunc;
 
   /* return ( vo_driver_t*) vo; */
   return vo_new_port( xine, ( vo_driver_t* )vo, 0 );
 }
 
 #if 0
 static vo_info_t vo_info_null = {
   5,
   XINE_VISUAL_TYPE_FB
 };