audio/filter: remove unneeded AF_CONTROLs, convert to enum

The AF control commands used an elaborate and unnecessary organization
for the command constants. Get rid of all that and convert the
definitions to a simple enum. Also remove the control commands that
were not really needed, because they were not used outside of the
filters that implemented them.

1 files changed, 2 insertions, 2 deletions

diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c
index edf29d00f2..1b4d28fa44 100644
--- a/audio/filter/af_volume.c
+++ b/audio/filter/af_volume.c
@@ -56,10 +56,10 @@ static int control(struct af_instance *af, int cmd, void *arg)
             mp_audio_set_format(af->data, af_fmt_to_planar(af->data->format));
         return af_test_output(af, in);
     }
-    case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET:
+    case AF_CONTROL_SET_VOLUME:
         s->level = *(float *)arg;
         return AF_OK;
-    case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET:
+    case AF_CONTROL_GET_VOLUME:
         *(float *)arg = s->level;
         return AF_OK;
     }