From 7a6c31ae069bb86e201d09525ef00ec265ca00f3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 12 Apr 2008 04:13:11 +0000 Subject: added outputBufferChunkData() Hiding OutputBuffer internals, again. We get an extra assertion in return. git-svn-id: https://svn.musicpd.org/mpd/trunk@7267 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/decode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/decode.c') diff --git a/src/decode.c b/src/decode.c index 3a73d9ef2..8650184c6 100644 --- a/src/decode.c +++ b/src/decode.c @@ -506,10 +506,8 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * } nextChunk = outputBufferAbsolute(cb, crossFadeChunks); if (nextChunk >= 0) { - pcm_mix(cb->chunks + - cb->begin * CHUNK_SIZE, - cb->chunks + - nextChunk * CHUNK_SIZE, + pcm_mix(outputBufferChunkData(cb, cb->begin), + outputBufferChunkData(cb, nextChunk), cb->chunkSize[cb->begin], cb->chunkSize[nextChunk], &(cb->audioFormat), -- cgit v1.2.3