This fixes the compilation but I have not tested it as I don't have a Davinci board.
Signed-off-by: Jean-Christophe DUBOIS <j...@tribudubois.net> --- gfxdrivers/davinci/davinci_osd.c | 29 +++++++++++++++++------------ gfxdrivers/davinci/davinci_video.c | 31 ++++++++++++++++++------------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/gfxdrivers/davinci/davinci_osd.c b/gfxdrivers/davinci/davinci_osd.c index 4c4d4f1..aba2b06 100644 --- a/gfxdrivers/davinci/davinci_osd.c +++ b/gfxdrivers/davinci/davinci_osd.c @@ -600,7 +600,10 @@ osdFlipRegion( CoreLayer *layer, void *region_data, CoreSurface *surface, DFBSurfaceFlipFlags flags, - CoreSurfaceBufferLock *lock ) + const DFBRegion * left_update, + CoreSurfaceBufferLock * left_lock, + const DFBRegion * right_update, + CoreSurfaceBufferLock * right_lock ) { CoreSurfaceBuffer *buffer; DavinciDriverData *ddrv = driver_data; @@ -610,21 +613,21 @@ osdFlipRegion( CoreLayer *layer, D_DEBUG_AT( Davinci_OSD, "%s()\n", __FUNCTION__ ); D_ASSERT( surface != NULL ); - D_ASSERT( lock != NULL ); + D_ASSERT( left_lock != NULL ); D_ASSERT( ddrv != NULL ); D_ASSERT( ddev != NULL ); - buffer = lock->buffer; + buffer = left_lock->buffer; D_ASSERT( buffer != NULL ); if (buffer->format != DSPF_RGB16) { if (DFB_PIXELFORMAT_HAS_ALPHA( buffer->format )) - update_buffers( ddrv, ddev, surface, lock, NULL ); + update_buffers( ddrv, ddev, surface, left_lock, NULL ); else - update_rgb( ddrv, ddev, surface, lock, NULL ); + update_rgb( ddrv, ddev, surface, left_lock, NULL ); } else - davincifb_pan_display( &ddrv->fb[OSD0], &dosd->var0, lock, flags, 0, 0 ); + davincifb_pan_display( &ddrv->fb[OSD0], &dosd->var0, left_lock, flags, 0, 0 ); dfb_surface_flip( surface, false ); @@ -639,8 +642,10 @@ osdUpdateRegion( CoreLayer *layer, void *layer_data, void *region_data, CoreSurface *surface, - const DFBRegion *update, - CoreSurfaceBufferLock *lock ) + const DFBRegion * left_update, + CoreSurfaceBufferLock * left_lock, + const DFBRegion * right_update, + CoreSurfaceBufferLock * right_lock ) { CoreSurfaceBuffer *buffer; DavinciDriverData *ddrv = driver_data; @@ -650,18 +655,18 @@ osdUpdateRegion( CoreLayer *layer, D_DEBUG_AT( Davinci_OSD, "%s()\n", __FUNCTION__ ); D_ASSERT( surface != NULL ); - D_ASSERT( lock != NULL ); + D_ASSERT( left_lock != NULL ); D_ASSERT( ddrv != NULL ); D_ASSERT( ddev != NULL ); - buffer = lock->buffer; + buffer = left_lock->buffer; D_ASSERT( buffer != NULL ); if (buffer->format != DSPF_RGB16) { if (DFB_PIXELFORMAT_HAS_ALPHA( buffer->format )) - update_buffers( ddrv, ddev, surface, lock, update ); + update_buffers( ddrv, ddev, surface, left_lock, left_update ); else - update_rgb( ddrv, ddev, surface, lock, update ); + update_rgb( ddrv, ddev, surface, left_lock, left_update ); } enable_osd( ddrv, dosd ); diff --git a/gfxdrivers/davinci/davinci_video.c b/gfxdrivers/davinci/davinci_video.c index 1a284a0..ba53737 100644 --- a/gfxdrivers/davinci/davinci_video.c +++ b/gfxdrivers/davinci/davinci_video.c @@ -343,21 +343,24 @@ videoFlipRegion( CoreLayer *layer, void *region_data, CoreSurface *surface, DFBSurfaceFlipFlags flags, - CoreSurfaceBufferLock *lock ) + const DFBRegion * left_update, + CoreSurfaceBufferLock * left_lock, + const DFBRegion * right_update, + CoreSurfaceBufferLock * right_lock ) { DFBResult ret; DavinciDriverData *ddrv = driver_data; DavinciVideoLayerData *dvid = layer_data; D_ASSERT( surface != NULL ); - D_ASSERT( lock != NULL ); + D_ASSERT( left_lock != NULL ); D_ASSERT( ddrv != NULL ); D_ASSERT( dvid != NULL ); D_DEBUG_AT( Davinci_Video, "%s( 0x%08lx [%d] 0x%04x [%4dx%4d] )\n", __FUNCTION__, - lock->phys, lock->pitch, flags, dvid->config.width, dvid->config.height ); + left_lock->phys, left_lock->pitch, flags, dvid->config.width, dvid->config.height ); - ret = ShowBuffer( ddrv, dvid, lock, NULL, flags ); + ret = ShowBuffer( ddrv, dvid, left_lock, NULL, flags ); if (ret) return ret; @@ -372,22 +375,24 @@ videoUpdateRegion( CoreLayer *layer, void *layer_data, void *region_data, CoreSurface *surface, - const DFBRegion *update, - CoreSurfaceBufferLock *lock ) + const DFBRegion * left_update, + CoreSurfaceBufferLock * left_lock, + const DFBRegion * right_update, + CoreSurfaceBufferLock * right_lock ) { DavinciDriverData *ddrv = driver_data; DavinciVideoLayerData *dvid = layer_data; D_ASSERT( surface != NULL ); - D_ASSERT( lock != NULL ); + D_ASSERT( left_lock != NULL ); D_ASSERT( ddrv != NULL ); D_ASSERT( dvid != NULL ); - if (update) { - DFBRectangle area = DFB_RECTANGLE_INIT_FROM_REGION( update ); + if (left_update) { + DFBRectangle area = DFB_RECTANGLE_INIT_FROM_REGION( left_update ); D_DEBUG_AT( Davinci_Video, "%s( 0x%08lx [%d], %4d,%4d-%4dx%4d )\n", __FUNCTION__, - lock->phys, lock->pitch, DFB_RECTANGLE_VALS( &area ) ); + left_lock->phys, left_lock->pitch, DFB_RECTANGLE_VALS( &area ) ); if (!dfb_rectangle_intersect( &area, &dvid->config.source )) { D_DEBUG_AT( Davinci_Video, " -> NO INTERSECTION with %4d,%4d-%4dx%4d\n", @@ -397,13 +402,13 @@ videoUpdateRegion( CoreLayer *layer, } if (!DFB_RECTANGLE_EQUAL( area, dvid->config.source )) - return ShowBuffer( ddrv, dvid, lock, &area, DSFLIP_NONE ); + return ShowBuffer( ddrv, dvid, left_lock, &area, DSFLIP_NONE ); } else D_DEBUG_AT( Davinci_Video, "%s( 0x%08lx [%d], %4dx%4d )\n", __FUNCTION__, - lock->phys, lock->pitch, dvid->config.width, dvid->config.height ); + left_lock->phys, left_lock->pitch, dvid->config.width, dvid->config.height ); - return ShowBuffer( ddrv, dvid, lock, NULL, DSFLIP_NONE ); + return ShowBuffer( ddrv, dvid, left_lock, NULL, DSFLIP_NONE ); } const DisplayLayerFuncs davinciVideoLayerFuncs = { -- 1.9.1 _______________________________________________ directfb-dev mailing list directfb-dev@directfb.org http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev