pcm_convert: convert to C++

2013-01-30 23:40:56 +01:00
parent 762c91b7f1
commit 361404fd59
10 changed files with 228 additions and 224 deletions
--- a/src/DecoderAPI.cxx
+++ b/src/DecoderAPI.cxx
@@ -402,10 +402,11 @@ decoder_data(struct decoder *decoder,
 	}

 	if (!audio_format_equals(&dc->in_audio_format, &dc->out_audio_format)) {
-		data = pcm_convert(&decoder->conv_state,
-				   &dc->in_audio_format, data, length,
-				   &dc->out_audio_format, &length,
-				   &error);
+		data = decoder->conv_state.Convert(&dc->in_audio_format,
+						   data, length,
+						   &dc->out_audio_format,
+						   &length,
+						   &error);
 		if (data == NULL) {
 			/* the PCM conversion has failed - stop
 			   playback, since we have no better way to