Client API: Add pa_stream_write_ext_free() function.

New function allows to pass data pointer that is a member
of the outer structure that need to be freed too when data
is not needed anymore.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek 2014-04-15 02:08:23 +02:00 committed by David Henningsson
parent 594da41d07
commit 78ca8cfc96
5 changed files with 41 additions and 7 deletions

View file

@ -1464,11 +1464,12 @@ int pa_stream_cancel_write(
return 0;
}
int pa_stream_write(
int pa_stream_write_ext_free(
pa_stream *s,
const void *data,
size_t length,
pa_free_cb_t free_cb,
void *free_cb_data,
int64_t offset,
pa_seek_mode_t seek) {
@ -1519,7 +1520,7 @@ int pa_stream_write(
chunk.index = 0;
if (free_cb && !pa_pstream_get_shm(s->context->pstream)) {
chunk.memblock = pa_memblock_new_user(s->context->mempool, (void*) t_data, t_length, free_cb, 1);
chunk.memblock = pa_memblock_new_user(s->context->mempool, (void*) t_data, t_length, free_cb, free_cb_data, 1);
chunk.length = t_length;
} else {
void *d;
@ -1544,7 +1545,7 @@ int pa_stream_write(
}
if (free_cb && pa_pstream_get_shm(s->context->pstream))
free_cb((void*) data);
free_cb(free_cb_data);
}
/* This is obviously wrong since we ignore the seeking index . But
@ -1591,6 +1592,17 @@ int pa_stream_write(
return 0;
}
int pa_stream_write(
pa_stream *s,
const void *data,
size_t length,
pa_free_cb_t free_cb,
int64_t offset,
pa_seek_mode_t seek) {
return pa_stream_write_ext_free(s, data, length, free_cb, (void*) data, offset, seek);
}
int pa_stream_peek(pa_stream *s, const void **data, size_t *length) {
pa_assert(s);
pa_assert(PA_REFCNT_VALUE(s) >= 1);