From 5090cf6484f5e7464aeba54d19500cc334a80fad Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 11 Feb 2009 18:00:41 +0100 Subject: audio: replaced parseAudioConfig() with audio_format_parse() Added audio_format_parse() in a separate library, with a modern interface: return a GError instead of logging errors. This allows the caller to deal with the error. --- src/output_init.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/output_init.c') diff --git a/src/output_init.c b/src/output_init.c index a3231f4d2..b7b088396 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -20,7 +20,7 @@ #include "output_api.h" #include "output_internal.h" #include "output_list.h" -#include "audio.h" +#include "audio_parser.h" #include @@ -94,9 +94,14 @@ audio_output_init(struct audio_output *ao, const struct config_param *param) pcm_convert_init(&ao->convert_state); if (format) { - if (0 != parseAudioConfig(&ao->config_audio_format, format)) { - g_error("error parsing format at line %i\n", bp->line); - } + GError *error = NULL; + bool ret; + + ret = audio_format_parse(&ao->config_audio_format, format, + &error); + if (!ret) + g_error("error parsing format at line %i: %s", + bp->line, error->message); } else audio_format_clear(&ao->config_audio_format); -- cgit v1.2.3