Revert r1404 and keep it on a development branch until it is fully tested.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1409 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-11-06 13:06:01 +00:00
parent 6ca819354c
commit 8dc6214276
36 changed files with 499 additions and 990 deletions

View file

@ -36,11 +36,10 @@ typedef struct pa_mix_info {
pa_memchunk chunk;
pa_cvolume volume;
void *userdata;
void *internal; /* Used internally by pa_mix(), should not be initialised when calling pa_mix() */
} pa_mix_info;
size_t pa_mix(
pa_mix_info channels[],
const pa_mix_info channels[],
unsigned nchannels,
void *data,
size_t length,