summaryrefslogtreecommitdiffstats
path: root/audio/filter/af_channels.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-18 14:16:08 +0100
committerwm4 <wm4@nowhere>2013-11-18 14:21:01 +0100
commit5594718b6bda3a230e2e2c3cb06d2837c5a02688 (patch)
treedca02cab9bde6d50d148a62b20ec99aa8601b847 /audio/filter/af_channels.c
parent93852b08f37f630b994d126751b4b9740a13219f (diff)
downloadmpv-5594718b6bda3a230e2e2c3cb06d2837c5a02688.tar.bz2
mpv-5594718b6bda3a230e2e2c3cb06d2837c5a02688.tar.xz
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.
Diffstat (limited to 'audio/filter/af_channels.c')
-rw-r--r--audio/filter/af_channels.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/filter/af_channels.c b/audio/filter/af_channels.c
index f77807a1af..d544e4d9c0 100644
--- a/audio/filter/af_channels.c
+++ b/audio/filter/af_channels.c
@@ -201,11 +201,11 @@ static int control(struct af_instance* af, int cmd, void* arg)
struct mp_chmap chmap;
mp_chmap_from_channels(&chmap, nch);
- if (AF_OK != af->control(af, AF_CONTROL_CHANNELS | AF_CONTROL_SET, &chmap))
+ if (AF_OK != af->control(af, AF_CONTROL_SET_CHANNELS, &chmap))
return AF_ERROR;
return AF_OK;
}
- case AF_CONTROL_CHANNELS | AF_CONTROL_SET:
+ case AF_CONTROL_SET_CHANNELS:
// Reinit must be called after this function has been called
mp_audio_set_channels(af->data, (struct mp_chmap *)arg);