From 29030b54c98b0aee65fbc10ebf7ba36bed98c02c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 10 Aug 2013 18:02:44 +0200
Subject: util/Error: new error passing library

Replaces GLib's GError.
---
 src/OutputControl.cxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/OutputControl.cxx')

diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index b8f3a3ea4..820713593 100644
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@@ -27,6 +27,7 @@
 #include "notify.hxx"
 #include "filter/ReplayGainFilterPlugin.hxx"
 #include "FilterPlugin.hxx"
+#include "util/Error.hxx"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -187,13 +188,10 @@ audio_output_open(struct audio_output *ao,
 	open = ao->open;
 
 	if (open && ao->mixer != NULL) {
-		GError *error = NULL;
-
-		if (!mixer_open(ao->mixer, &error)) {
+		Error error;
+		if (!mixer_open(ao->mixer, error))
 			g_warning("Failed to open mixer for '%s': %s",
-				  ao->name, error->message);
-			g_error_free(error);
-		}
+				  ao->name, error.GetMessage());
 	}
 
 	return open;
-- 
cgit v1.2.3