diff options
Diffstat (limited to 'libvo/vo_directfb2.c')
-rw-r--r-- | libvo/vo_directfb2.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 2d8ec11f79..0c2fb9b423 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -132,8 +132,7 @@ static int field_parity = -1; * implementation * ******************************/ -static void unlock(void) -{ +void unlock(void) { if (frame && framelocked) frame->Unlock(frame); if (primary && primarylocked) primary->Unlock(primary); } @@ -305,7 +304,7 @@ static int preinit(const char *arg) } -static DFBSurfacePixelFormat convformat(uint32_t format) +DFBSurfacePixelFormat convformat(uint32_t format) { // add more formats !!! switch (format) { @@ -349,9 +348,9 @@ unsigned int height; int setsize; } enum1_t; -static DFBEnumerationResult test_format_callback(unsigned int id, - DFBDisplayLayerDescription desc, - void *data) +DFBEnumerationResult test_format_callback( unsigned int id, + DFBDisplayLayerDescription desc, + void *data) { enum1_t *params =(enum1_t *)data; IDirectFBDisplayLayer *layer; @@ -447,8 +446,7 @@ int bpp; } videomode_t; -static DFBEnumerationResult video_modes_callback(int width, int height, - int bpp, void *data) +DFBEnumerationResult video_modes_callback( int width,int height,int bpp, void *data) { videomode_t *params =(videomode_t *)data; @@ -1417,7 +1415,7 @@ static uint32_t put_image(mp_image_t *mpi){ -static int control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data) { switch (request) { case VOCTRL_QUERY_FORMAT: @@ -1428,25 +1426,13 @@ static int control(uint32_t request, void *data, ...) return put_image(data); case VOCTRL_SET_EQUALIZER: { - va_list ap; - int value; - - va_start(ap, data); - value = va_arg(ap, int); - va_end(ap); - - return directfb_set_video_eq(data, value); + struct voctrl_set_equalizer_args *args = data; + return directfb_set_video_eq(args->name, args->value); } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int*); - va_end(ap); - - return directfb_get_video_eq(data, value); + struct voctrl_get_equalizer_args *args = data; + return directfb_get_video_eq(args->name, args->valueptr); } }; return VO_NOTIMPL; |