diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-06-11 12:08:37 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-06-11 12:08:37 +0000 |
| commit | 00da37f2c448096cdd54481b072db47b2f253141 (patch) | |
| tree | cb6c51231fa498831b3e63660105ec00ea98d8f5 /src/pulsecore/sample-util.h | |
| parent | 6aeec56708f4af2da0b83fdd65a0d153b9bed272 (diff) | |
Merge HUGE set of changes temporarily into a branch, to allow me to move them from one machine to another (lock-free and stuff)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1469 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sample-util.h')
| -rw-r--r-- | src/pulsecore/sample-util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pulsecore/sample-util.h b/src/pulsecore/sample-util.h index 3ff065ab..2b11ad3c 100644 --- a/src/pulsecore/sample-util.h +++ b/src/pulsecore/sample-util.h @@ -39,10 +39,11 @@ 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( - const pa_mix_info channels[], + pa_mix_info channels[], unsigned nchannels, void *data, size_t length, |