Change VOCTRL_[GET|SET]_EQUALIZER argument passing

These were the only voctrl types with more than one argument. The
second argument was passed using variable arguments. Change them to
use a single argument (address of a struct containing both old
arguments). This makes forwarding the arguments to other functions
easier and allows simplifying code.

1 files changed, 14 insertions, 24 deletions

diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 288a7a7e20..a48c7becbf 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -240,22 +240,17 @@ static int control(uint32_t request, void *data, ...)
 	    }
 	case VOCTRL_SET_EQUALIZER:
 	    {
-		va_list ap;
-		int value;
 		em8300_bcs_t bcs;
-		
-		va_start(ap, data);
-		value = va_arg(ap, int);
-		va_end(ap);
+		struct voctrl_set_equalizer_args *args = data;
 
 		if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0)
 		    return VO_FALSE;
-		if (!strcasecmp(data, "brightness"))
-		    bcs.brightness = (value+100)*5;
-		else if (!strcasecmp(data, "contrast"))
-		    bcs.contrast = (value+100)*5;
-		else if (!strcasecmp(data, "saturation"))
-		    bcs.saturation = (value+100)*5;
+		if (!strcasecmp(args->name, "brightness"))
+		    bcs.brightness = (args->value+100)*5;
+		else if (!strcasecmp(args->name, "contrast"))
+		    bcs.contrast = (args->value+100)*5;
+		else if (!strcasecmp(args->name, "saturation"))
+		    bcs.saturation = (args->value+100)*5;
 		else return VO_FALSE;
         
 		if (ioctl(fd_control, EM8300_IOCTL_SETBCS, &bcs) < 0)
@@ -264,23 +259,18 @@ static int control(uint32_t request, void *data, ...)
 	    }
 	case VOCTRL_GET_EQUALIZER:
 	    {
-		va_list ap;
-		int *value;
 		em8300_bcs_t bcs;
+		struct voctrl_get_equalizer_args *args = data;
 		
-		va_start(ap, data);
-		value = va_arg(ap, int*);
-		va_end(ap);
-
 		if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0)
 		    return VO_FALSE;
 		
-		if (!strcasecmp(data, "brightness"))
-		    *value = (bcs.brightness/5)-100;
-		else if (!strcasecmp(data, "contrast"))
-		    *value = (bcs.contrast/5)-100;
-		else if (!strcasecmp(data, "saturation"))
-		    *value = (bcs.saturation/5)-100;
+		if (!strcasecmp(args->name, "brightness"))
+		    *args->valueptr = (bcs.brightness/5)-100;
+		else if (!strcasecmp(args->name, "contrast"))
+		    *args->valueptr = (bcs.contrast/5)-100;
+		else if (!strcasecmp(args->name, "saturation"))
+		    *args->valueptr = (bcs.saturation/5)-100;
 		else return VO_FALSE;
         
 		return VO_TRUE;