mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6687dd0131
commit
a67c21f093
294 changed files with 79057 additions and 11614 deletions
|
|
@ -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,
|
||||
|
|
@ -55,4 +56,11 @@ void pa_volume_memchunk(
|
|||
const pa_sample_spec *spec,
|
||||
const pa_cvolume *volume);
|
||||
|
||||
size_t pa_frame_align(size_t l, const pa_sample_spec *ss) PA_GCC_PURE;
|
||||
|
||||
int pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE;
|
||||
|
||||
void pa_interleave(const void *src[], unsigned channels, void *dst, size_t ss, unsigned n);
|
||||
void pa_deinterleave(const void *src, void *dst[], unsigned channels, size_t ss, unsigned n);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue