From 29030b54c98b0aee65fbc10ebf7ba36bed98c02c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 10 Aug 2013 18:02:44 +0200 Subject: util/Error: new error passing library Replaces GLib's GError. --- src/AudioConfig.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/AudioConfig.cxx') diff --git a/src/AudioConfig.cxx b/src/AudioConfig.cxx index 9ead61afe..64c9d76d5 100644 --- a/src/AudioConfig.cxx +++ b/src/AudioConfig.cxx @@ -23,6 +23,7 @@ #include "AudioParser.hxx" #include "conf.h" #include "mpd_error.h" +#include "util/Error.hxx" static AudioFormat configured_audio_format; @@ -37,15 +38,13 @@ getOutputAudioFormat(AudioFormat inAudioFormat) void initAudioConfig(void) { const struct config_param *param = config_get_param(CONF_AUDIO_OUTPUT_FORMAT); - GError *error = NULL; - bool ret; if (param == NULL) return; - ret = audio_format_parse(configured_audio_format, param->value, - true, &error); - if (!ret) + Error error; + if (!audio_format_parse(configured_audio_format, param->value, + true, error)) MPD_ERROR("error parsing line %i: %s", - param->line, error->message); + param->line, error.GetMessage()); } -- cgit v1.2.3