diff options
Diffstat (limited to 'src/pcm')
| -rw-r--r-- | src/pcm/PcmConvert.cxx | 10 | ||||
| -rw-r--r-- | src/pcm/PcmConvert.hxx | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx index ad79e60fc..ba9a691fc 100644 --- a/src/pcm/PcmConvert.cxx +++ b/src/pcm/PcmConvert.cxx @@ -117,12 +117,9 @@ PcmConvert::Close() #endif } -const void * -PcmConvert::Convert(const void *src, size_t src_size, - size_t *dest_size_r, - Error &error) +ConstBuffer<void> +PcmConvert::Convert(ConstBuffer<void> buffer, Error &error) { - ConstBuffer<void> buffer(src, src_size); AudioFormat format = src_format; if (format.format == SampleFormat::DSD) { @@ -164,6 +161,5 @@ PcmConvert::Convert(const void *src, size_t src_size, format.channels = dest_format.channels; } - *dest_size_r = buffer.size; - return buffer.data; + return buffer; } diff --git a/src/pcm/PcmConvert.hxx b/src/pcm/PcmConvert.hxx index c65835421..9d63e07c9 100644 --- a/src/pcm/PcmConvert.hxx +++ b/src/pcm/PcmConvert.hxx @@ -70,16 +70,12 @@ public: * * @param src_format the source audio format * @param src the source PCM buffer - * @param src_size the size of #src in bytes * @param dest_format the requested destination audio format - * @param dest_size_r returns the number of bytes of the destination buffer * @param error_r location to store the error occurring, or nullptr to * ignore errors * @return the destination buffer, or nullptr on error */ - const void *Convert(const void *src, size_t src_size, - size_t *dest_size_r, - Error &error); + ConstBuffer<void> Convert(ConstBuffer<void> src, Error &error); }; bool |