oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output: convert config_audio_format to an audio_format struct

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

13
src/output_init.c
View File

@@ -154,14 +154,14 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
p = config_get_block_string(param, AUDIO_OUTPUT_FORMAT,
NULL);
ao->config_audio_format = p != NULL;
if (p != NULL) {
bool success =
audio_format_parse(&ao->out_audio_format,
audio_format_parse(&ao->config_audio_format,
p, error_r);
if (!success)
return false;
}
} else
audio_format_clear(&ao->config_audio_format);
} else {
g_warning("No \"%s\" defined in config file\n",
CONF_AUDIO_OUTPUT);
@@ -174,7 +174,8 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
plugin->name);
ao->name = "default detected output";
ao->config_audio_format = false;
audio_format_clear(&ao->config_audio_format);
}
ao->plugin = plugin;
@@ -194,8 +195,8 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
ao->mutex = g_mutex_new();
ao->data = ao_plugin_init(plugin,
ao->config_audio_format
? &ao->out_audio_format : NULL,
audio_format_defined(&ao->config_audio_format)
? &ao->config_audio_format : NULL,
param, error_r);
if (ao->data == NULL)
return false;