output: convert config_audio_format to an audio_format struct

This allows more sophisticated audio format selection.
This commit is contained in:
Max Kellermann
2009-10-21 22:37:28 +02:00
parent 643650dba7
commit 2c05430002
3 changed files with 16 additions and 14 deletions

View File

@@ -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);