From 2c05430002c66f69c498eec40b961d4eabef66c2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 21 Oct 2009 22:37:28 +0200 Subject: output: convert config_audio_format to an audio_format struct This allows more sophisticated audio format selection. --- src/output_thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/output_thread.c') diff --git a/src/output_thread.c b/src/output_thread.c index 11dea0845..dd97d88b0 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -67,7 +67,9 @@ ao_open(struct audio_output *ao) return; } - if (!ao->config_audio_format) + if (audio_format_defined(&ao->config_audio_format)) + ao->out_audio_format = ao->config_audio_format; + else ao->out_audio_format = *filter_audio_format; success = ao_plugin_open(ao->plugin, ao->data, @@ -164,7 +166,7 @@ ao_reopen_filter(struct audio_output *ao) static void ao_reopen(struct audio_output *ao) { - if (!ao->config_audio_format) { + if (!audio_format_defined(&ao->config_audio_format)) { if (ao->open) { const struct music_pipe *mp = ao->pipe; ao_close(ao); -- cgit v1.2.3