aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/HttpdInternal.hxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-08-10 18:02:44 +0200
committerMax Kellermann <max@duempel.org>2013-09-04 18:14:22 +0200
commit29030b54c98b0aee65fbc10ebf7ba36bed98c02c (patch)
tree79766830b55ebca38ddbce84d8d548227eedb69e /src/output/HttpdInternal.hxx
parentc9fcc7f14860777458153eb2d13c773ccfa1daa2 (diff)
downloadmpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.gz
mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.tar.xz
mpd-29030b54c98b0aee65fbc10ebf7ba36bed98c02c.zip
util/Error: new error passing library
Replaces GLib's GError.
Diffstat (limited to 'src/output/HttpdInternal.hxx')
-rw-r--r--src/output/HttpdInternal.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx
index e8a37e033..39fc700a3 100644
--- a/src/output/HttpdInternal.hxx
+++ b/src/output/HttpdInternal.hxx
@@ -33,6 +33,7 @@
#include <forward_list>
struct config_param;
+class Error;
class EventLoop;
class ServerSocket;
class HttpdClient;
@@ -123,21 +124,20 @@ struct HttpdOutput final : private ServerSocket {
HttpdOutput(EventLoop &_loop);
~HttpdOutput();
- bool Configure(const config_param &param, GError **error_r);
+ bool Configure(const config_param &param, Error &error);
- bool Bind(GError **error_r);
+ bool Bind(Error &error);
void Unbind();
/**
* Caller must lock the mutex.
*/
- bool OpenEncoder(AudioFormat &audio_format,
- GError **error_r);
+ bool OpenEncoder(AudioFormat &audio_format, Error &error);
/**
* Caller must lock the mutex.
*/
- bool Open(AudioFormat &audio_format, GError **error_r);
+ bool Open(AudioFormat &audio_format, Error &error);
/**
* Caller must lock the mutex.
@@ -194,7 +194,7 @@ struct HttpdOutput final : private ServerSocket {
*/
void BroadcastFromEncoder();
- bool EncodeAndPlay(const void *chunk, size_t size, GError **error_r);
+ bool EncodeAndPlay(const void *chunk, size_t size, Error &error);
void SendTag(const Tag *tag);