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/output/NullOutputPlugin.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/output/NullOutputPlugin.cxx') diff --git a/src/output/NullOutputPlugin.cxx b/src/output/NullOutputPlugin.cxx index 0ce32fbda..e2eec9dbc 100644 --- a/src/output/NullOutputPlugin.cxx +++ b/src/output/NullOutputPlugin.cxx @@ -31,9 +31,9 @@ struct NullOutput { Timer *timer; - bool Initialize(const config_param ¶m, GError **error_r) { + bool Initialize(const config_param ¶m, Error &error) { return ao_base_init(&base, &null_output_plugin, param, - error_r); + error); } void Deinitialize() { @@ -42,11 +42,11 @@ struct NullOutput { }; static struct audio_output * -null_init(const config_param ¶m, GError **error_r) +null_init(const config_param ¶m, Error &error) { NullOutput *nd = new NullOutput(); - if (!nd->Initialize(param, error_r)) { + if (!nd->Initialize(param, error)) { delete nd; return nullptr; } @@ -67,7 +67,7 @@ null_finish(struct audio_output *ao) static bool null_open(struct audio_output *ao, AudioFormat &audio_format, - gcc_unused GError **error) + gcc_unused Error &error) { NullOutput *nd = (NullOutput *)ao; @@ -98,7 +98,7 @@ null_delay(struct audio_output *ao) static size_t null_play(struct audio_output *ao, gcc_unused const void *chunk, size_t size, - gcc_unused GError **error) + gcc_unused Error &error) { NullOutput *nd = (NullOutput *)ao; Timer *timer = nd->timer; -- cgit v1.2.3