From 9526fdbe730edb4b095a1e12aade0e16f1da2292 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 21 Oct 2009 23:01:04 +0200 Subject: audio_format: wildcards allowed in audio_format configuration An asterisk means that this attribute should not be enforced, and stays whatever it used to be. This way, some configuration values work like masks. --- src/output_init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/output_init.c') diff --git a/src/output_init.c b/src/output_init.c index f097f2c2d..745b63e30 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -157,7 +157,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, if (p != NULL) { bool success = audio_format_parse(&ao->config_audio_format, - p, error_r); + p, true, error_r); if (!success) return false; } else @@ -195,8 +195,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, ao->mutex = g_mutex_new(); ao->data = ao_plugin_init(plugin, - audio_format_defined(&ao->config_audio_format) - ? &ao->config_audio_format : NULL, + &ao->config_audio_format, param, error_r); if (ao->data == NULL) return false; -- cgit v1.2.3