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/pcm/PcmResample.cxx | |
| 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 '')
| -rw-r--r-- | src/pcm/PcmResample.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pcm/PcmResample.cxx b/src/pcm/PcmResample.cxx index 423e3d442..9ade8cf5b 100644 --- a/src/pcm/PcmResample.cxx +++ b/src/pcm/PcmResample.cxx @@ -39,7 +39,7 @@ pcm_resample_lsr_enabled(void) #endif bool -pcm_resample_global_init(GError **error_r) +pcm_resample_global_init(Error &error) { #ifdef HAVE_LIBSAMPLERATE const char *converter = @@ -47,11 +47,11 @@ pcm_resample_global_init(GError **error_r) lsr_enabled = strcmp(converter, "internal") != 0; if (lsr_enabled) - return pcm_resample_lsr_global_init(converter, error_r); + return pcm_resample_lsr_global_init(converter, error); else return true; #else - (void)error_r; + (void)error; return true; #endif } @@ -84,7 +84,7 @@ const float * PcmResampler::ResampleFloat(unsigned channels, unsigned src_rate, const float *src_buffer, size_t src_size, unsigned dest_rate, size_t *dest_size_r, - GError **error_r) + Error &error_r) { #ifdef HAVE_LIBSAMPLERATE if (pcm_resample_lsr_enabled()) @@ -110,7 +110,7 @@ const int16_t * PcmResampler::Resample16(unsigned channels, unsigned src_rate, const int16_t *src_buffer, size_t src_size, unsigned dest_rate, size_t *dest_size_r, - GError **error_r) + Error &error_r) { #ifdef HAVE_LIBSAMPLERATE if (pcm_resample_lsr_enabled()) @@ -131,7 +131,7 @@ const int32_t * PcmResampler::Resample32(unsigned channels, unsigned src_rate, const int32_t *src_buffer, size_t src_size, unsigned dest_rate, size_t *dest_size_r, - GError **error_r) + Error &error_r) { #ifdef HAVE_LIBSAMPLERATE if (pcm_resample_lsr_enabled()) |