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/pcm/PcmConvert.hxx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/pcm/PcmConvert.hxx') diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx index 42b59e407..40f785179 100644 --- a/src/pcm/PcmConvert.hxx +++ b/src/pcm/PcmConvert.hxx @@ -25,9 +25,10 @@ #include "PcmResample.hxx" #include "PcmBuffer.hxx" -#include +#include struct AudioFormat; +class Error; /** * This object is statically allocated (within another struct), and @@ -75,38 +76,34 @@ public: const void *src, size_t src_size, AudioFormat dest_format, size_t *dest_size_r, - GError **error_r); + Error &error); private: const int16_t *Convert16(AudioFormat src_format, const void *src_buffer, size_t src_size, AudioFormat dest_format, size_t *dest_size_r, - GError **error_r); + Error &error); const int32_t *Convert24(AudioFormat src_format, const void *src_buffer, size_t src_size, AudioFormat dest_format, size_t *dest_size_r, - GError **error_r); + Error &error); const int32_t *Convert32(AudioFormat src_format, const void *src_buffer, size_t src_size, AudioFormat dest_format, size_t *dest_size_r, - GError **error_r); + Error &error); const float *ConvertFloat(AudioFormat src_format, const void *src_buffer, size_t src_size, AudioFormat dest_format, size_t *dest_size_r, - GError **error_r); + Error &error); }; -static inline GQuark -pcm_convert_quark(void) -{ - return g_quark_from_static_string("pcm_convert"); -} +extern const class Domain pcm_convert_domain; #endif -- cgit v1.2.3