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, 4 insertions, 16 deletions

diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index ca79dab24f..2b56ee48b6 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -764,25 +764,13 @@ static int control(uint32_t request, void *data, ...)
             return get_image(data);
         case VOCTRL_SET_EQUALIZER:
             {
-                va_list ap;
-                int value;
-
-                va_start(ap, data);
-                value = va_arg(ap, int);
-
-                va_end(ap);
-                return vo_x11_set_equalizer(data, value);
+                struct voctrl_set_equalizer_args *args = data;
+                return vo_x11_set_equalizer(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 vo_x11_get_equalizer(data, value);
+                struct voctrl_get_equalizer_args *args = data;
+                return vo_x11_get_equalizer(args->name, args->valueptr);
             }
         case VOCTRL_ONTOP:
             vo_x11_ontop();