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/PlayerControl.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/PlayerControl.hxx') diff --git a/src/PlayerControl.hxx b/src/PlayerControl.hxx index bea2e05eb..498f91143 100644 --- a/src/PlayerControl.hxx +++ b/src/PlayerControl.hxx @@ -23,6 +23,7 @@ #include "AudioFormat.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" +#include "util/Error.hxx" #include @@ -127,7 +128,7 @@ struct player_control { * #PLAYER_ERROR_NONE. The object must be freed when this * object transitions back to #PLAYER_ERROR_NONE. */ - GError *error; + Error error; uint16_t bit_rate; AudioFormat audio_format; @@ -262,10 +263,9 @@ struct player_control { * Caller must lock the object. * * @param type the error type; must not be #PLAYER_ERROR_NONE - * @param error detailed error information; must not be NULL; the - * #player_control takes over ownership of this #GError instance + * @param error detailed error information; must be defined. */ - void SetError(player_error type, GError *error); + void SetError(player_error type, Error &&error); void ClearError(); -- cgit v1.2.3