diff options
| author | wm4 <wm4@nowhere> | 2013-12-05 00:01:46 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-05 00:01:46 +0100 |
| commit | ed024aadb6e7be6c3d910045a64db53a6c95e98f (patch) | |
| tree | f26724d268e13ee8ec8f327ea829b65ccd6fab19 /audio/filter/af_ladspa.c | |
| parent | 2bcfb49a390a928c535cba7cab2b4136f27fceca (diff) | |
| download | mpv-ed024aadb6e7be6c3d910045a64db53a6c95e98f.tar.bz2 mpv-ed024aadb6e7be6c3d910045a64db53a6c95e98f.tar.xz | |
audio/filter: change filter callback signature
The new signature is actually closer to how it actually works, and
someone who is not familiar to the API and how it works might make fewer
fatal mistakes with the new signature than the old one. Pretty weird.
Do this to sneak in a flags parameter, which will later be used to flush
remaining data of at least vf_lavfi.
Diffstat (limited to 'audio/filter/af_ladspa.c')
| -rw-r--r-- | audio/filter/af_ladspa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/filter/af_ladspa.c b/audio/filter/af_ladspa.c index 1d7f9c9fa5..3a05ced3cd 100644 --- a/audio/filter/af_ladspa.c +++ b/audio/filter/af_ladspa.c @@ -564,7 +564,7 @@ static void uninit(struct af_instance *af) { * \return Either AF_ERROR or AF_OK */ -static struct mp_audio* play(struct af_instance *af, struct mp_audio *data) { +static int filter(struct af_instance *af, struct mp_audio *data, int flags) { af_ladspa_t *setup = af->priv; const LADSPA_Descriptor *pdes = setup->plugin_descriptor; float *audio = (float*)data->planes[0]; @@ -574,7 +574,7 @@ static struct mp_audio* play(struct af_instance *af, struct mp_audio *data) { int i, p; if (setup->status !=AF_OK) - return data; + return -1; /* See if it's the first call. If so, setup inbufs/outbufs, instantiate * plugin, connect ports and activate plugin @@ -720,7 +720,7 @@ static struct mp_audio* play(struct af_instance *af, struct mp_audio *data) { /* done */ - return data; + return 0; } /* ------------------------------------------------------------------------- */ @@ -736,12 +736,12 @@ static int af_open(struct af_instance *af) { af->control=control; af->uninit=uninit; - af->play=play; + af->filter=filter; af_ladspa_t *setup = af->priv; setup->status = AF_ERROR; /* will be set to AF_OK if - * all went OK and play() + * all went OK and filter() * should proceed. */ |