diff options
| author | Max Kellermann <max@duempel.org> | 2008-04-12 04:13:11 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:13:11 +0000 |
| commit | 7a6c31ae069bb86e201d09525ef00ec265ca00f3 (patch) | |
| tree | a8e648788f1034fc282f96ad654121d72a19cc31 /src/decode.c | |
| parent | 71b24e095002267e6369eeae21c5139037fb0e93 (diff) | |
| download | mpd-7a6c31ae069bb86e201d09525ef00ec265ca00f3.tar.gz mpd-7a6c31ae069bb86e201d09525ef00ec265ca00f3.tar.xz mpd-7a6c31ae069bb86e201d09525ef00ec265ca00f3.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/decode.c | 6 |
1 files changed, 2 insertions, 4 deletions
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), |