From c75cb67c4406648314ce2a15daf8b632374d7913 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 29 Jul 2013 08:10:10 +0200 Subject: pcm_buffer: convert to C++ --- src/pcm/PcmConvert.cxx | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/pcm/PcmConvert.cxx') diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx index d280101b5..69e1c5d04 100644 --- a/src/pcm/PcmConvert.cxx +++ b/src/pcm/PcmConvert.cxx @@ -34,14 +34,10 @@ PcmConvert::PcmConvert() { - pcm_buffer_init(&format_buffer); - pcm_buffer_init(&channels_buffer); } PcmConvert::~PcmConvert() { - pcm_buffer_deinit(&format_buffer); - pcm_buffer_deinit(&channels_buffer); } void @@ -62,7 +58,7 @@ PcmConvert::Convert16(const audio_format *src_format, assert(dest_format->format == SAMPLE_FORMAT_S16); - buf = pcm_convert_to_16(&format_buffer, dither, + buf = pcm_convert_to_16(format_buffer, dither, sample_format(src_format->format), src_buffer, src_size, &len); @@ -74,7 +70,7 @@ PcmConvert::Convert16(const audio_format *src_format, } if (src_format->channels != dest_format->channels) { - buf = pcm_convert_channels_16(&channels_buffer, + buf = pcm_convert_channels_16(channels_buffer, dest_format->channels, src_format->channels, buf, len, &len); @@ -112,7 +108,7 @@ PcmConvert::Convert24(const audio_format *src_format, assert(dest_format->format == SAMPLE_FORMAT_S24_P32); - buf = pcm_convert_to_24(&format_buffer, + buf = pcm_convert_to_24(format_buffer, sample_format(src_format->format), src_buffer, src_size, &len); if (buf == NULL) { @@ -123,7 +119,7 @@ PcmConvert::Convert24(const audio_format *src_format, } if (src_format->channels != dest_format->channels) { - buf = pcm_convert_channels_24(&channels_buffer, + buf = pcm_convert_channels_24(channels_buffer, dest_format->channels, src_format->channels, buf, len, &len); @@ -161,7 +157,7 @@ PcmConvert::Convert32(const audio_format *src_format, assert(dest_format->format == SAMPLE_FORMAT_S32); - buf = pcm_convert_to_32(&format_buffer, + buf = pcm_convert_to_32(format_buffer, sample_format(src_format->format), src_buffer, src_size, &len); if (buf == NULL) { @@ -172,7 +168,7 @@ PcmConvert::Convert32(const audio_format *src_format, } if (src_format->channels != dest_format->channels) { - buf = pcm_convert_channels_32(&channels_buffer, + buf = pcm_convert_channels_32(channels_buffer, dest_format->channels, src_format->channels, buf, len, &len); @@ -212,7 +208,7 @@ PcmConvert::ConvertFloat(const audio_format *src_format, /* convert to float now */ - buffer = pcm_convert_to_float(&format_buffer, + buffer = pcm_convert_to_float(format_buffer, sample_format(src_format->format), buffer, size, &size); if (buffer == NULL) { @@ -225,7 +221,7 @@ PcmConvert::ConvertFloat(const audio_format *src_format, /* convert channels */ if (src_format->channels != dest_format->channels) { - buffer = pcm_convert_channels_float(&channels_buffer, + buffer = pcm_convert_channels_float(channels_buffer, dest_format->channels, src_format->channels, buffer, size, &size); -- cgit v1.2.3