diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-10 18:02:44 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-04 18:14:22 +0200 |
| commit | 29030b54c98b0aee65fbc10ebf7ba36bed98c02c (patch) | |
| tree | 79766830b55ebca38ddbce84d8d548227eedb69e /src/PlayerControl.hxx | |
| parent | c9fcc7f14860777458153eb2d13c773ccfa1daa2 (diff) | |
| download | mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.gz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.xz mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.zip | |
util/Error: new error passing library
Replaces GLib's GError.
Diffstat (limited to 'src/PlayerControl.hxx')
| -rw-r--r-- | src/PlayerControl.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 <glib.h> @@ -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(); |