From f7a427676c0fe3c12509e3d9a243301f93626b0a Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 Apr 2013 19:47:51 +0200 Subject: audio: add some setters for mp_audio, and require filters to use them mp_audio has some redundant fields. Setters like mp_audio_set_format() initialize these properly. Also move the mp_audio struct to a the file audio.c. We can remove a mysterious line of code from af.c: in.format |= af_bits2fmt(in.bps * 8); I'm not sure if this was ever actually needed, or if it was some kind of "make it work" quick-fix that works against the way things were supposed to work. All filters etc. now set the format correctly, so if there ever was a need for this code, it's definitely gone. --- audio/filter/af_ladspa.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'audio/filter/af_ladspa.c') diff --git a/audio/filter/af_ladspa.c b/audio/filter/af_ladspa.c index c1b3f24360..f7ec0d278f 100644 --- a/audio/filter/af_ladspa.c +++ b/audio/filter/af_ladspa.c @@ -498,10 +498,8 @@ static int control(struct af_instance *af, int cmd, void *arg) { /* accept FLOAT, let af_format do conversion */ - af->data->rate = ((struct mp_audio*)arg)->rate; - af->data->nch = ((struct mp_audio*)arg)->nch; - af->data->format = AF_FORMAT_FLOAT_NE; - af->data->bps = 4; + mp_audio_copy_config(af->data, (struct mp_audio*)arg); + mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE); /* arg->len is not set here yet, so init of buffers and connecting the * filter, has to be done in play() :-/ -- cgit v1.2.3