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

audio: replaced parseAudioConfig() with audio_format_parse()

Browse Source 
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.
This commit is contained in:
Max Kellermann
2009-02-11 18:00:41 +01:00
parent 5484aaee5f
commit 5090cf6484
6 changed files with 153 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/output_init.c
View File

@@ -20,7 +20,7 @@
#include "output_api.h"
#include "output_internal.h"
#include "output_list.h"
#include "audio.h"
#include "audio_parser.h"
#include <glib.h>
@@ -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);