diff options
| author | Max Kellermann <max@duempel.org> | 2009-12-25 14:27:32 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-25 17:29:41 +0100 |
| commit | b54bde6f2b9f826cd7189182d733aada66c95dd8 (patch) | |
| tree | f07f7b57f0d83879e6aa35ba3bbdaa06b4cbf4f1 /src/filter_plugin.c | |
| parent | d2051c7f50deff0532566c070aaf4fec5d774558 (diff) | |
filter_plugin: allow open() to force an input format
Make the audio_format argument non-const. Allow the open() method to
modify it, to indicate that it wants a different input audio format
than the one specified. Check that condition in chain_filter_open(),
and fail.
Diffstat (limited to 'src/filter_plugin.c')
| -rw-r--r-- | src/filter_plugin.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/filter_plugin.c b/src/filter_plugin.c index ecc4b543..21cb2f27 100644 --- a/src/filter_plugin.c +++ b/src/filter_plugin.c @@ -74,18 +74,23 @@ filter_free(struct filter *filter) } const struct audio_format * -filter_open(struct filter *filter, const struct audio_format *audio_format, +filter_open(struct filter *filter, struct audio_format *audio_format, GError **error_r) { + const struct audio_format *out_audio_format; + assert(filter != NULL); assert(audio_format != NULL); assert(audio_format_valid(audio_format)); assert(error_r == NULL || *error_r == NULL); - audio_format = filter->plugin->open(filter, audio_format, error_r); - assert(audio_format == NULL || audio_format_valid(audio_format)); + out_audio_format = filter->plugin->open(filter, audio_format, error_r); + + assert(out_audio_format == NULL || audio_format_valid(audio_format)); + assert(out_audio_format == NULL || + audio_format_valid(out_audio_format)); - return audio_format; + return out_audio_format; } void |