1 files changed, 11 insertions, 25 deletions

diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index e69c7ae932..4a88b3881e 100644
--- a/libvo/vo_directfb2.c
+++ b/libvo/vo_directfb2.c
@@ -138,8 +138,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);
 }
@@ -311,7 +310,7 @@ static int preinit(const char *arg)
 
 }
 
-static DFBSurfacePixelFormat convformat(uint32_t format)
+DFBSurfacePixelFormat convformat(uint32_t format)
 {
 // add more formats !!!
 	switch (format) {
@@ -351,9 +350,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;
@@ -449,8 +448,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;
 
@@ -1413,7 +1411,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:
@@ -1424,25 +1422,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;