From 6147bcce359358855ad02d8d5cbd6575d39b0449 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 26 Jun 2015 23:06:37 +0200 Subject: audio: fix format function consistency issues Replace all the check macros with function calls. Give them all the same case and naming schema. Drop af_fmt2bits(). Only af_fmt2bps() survives as af_fmt_to_bytes(). Introduce af_fmt_is_pcm(), and use it in situations that used !AF_FORMAT_IS_SPECIAL. Nobody really knew what a "special" format was. It simply meant "not PCM". --- audio/filter/af_volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'audio/filter/af_volume.c') diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c index d66e38c0e1..1b564f0983 100644 --- a/audio/filter/af_volume.c +++ b/audio/filter/af_volume.c @@ -68,7 +68,7 @@ static int control(struct af_instance *af, int cmd, void *arg) } else { mp_audio_set_format(af->data, AF_FORMAT_FLOAT); } - if (AF_FORMAT_IS_PLANAR(in->format)) + if (af_fmt_is_planar(in->format)) mp_audio_set_format(af->data, af_fmt_to_planar(af->data->format)); s->rgain = 1.0; if ((s->rgain_track || s->rgain_album) && af->replaygain_data) { -- cgit v1.2.3