From 98cb6aa4a30a993ddf2c15f0a03cb4d94383d4d9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 20 Feb 2006 17:09:39 +0000 Subject: * a lot of doxygen updates * s/pa_operation_callback/pa_operation_callback_t/g * add more typedefs for function prototypes * add API to query the channel map used by a pa_stream git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@530 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/polyp/stream.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/polyp/stream.c') diff --git a/src/polyp/stream.c b/src/polyp/stream.c index 5497f0c4..88971085 100644 --- a/src/polyp/stream.c +++ b/src/polyp/stream.c @@ -592,7 +592,7 @@ pa_operation * pa_stream_drain(pa_stream *s, void (*cb) (pa_stream*s, int succes PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction == PA_STREAM_PLAYBACK, PA_ERR_BADSTATE); o = pa_operation_new(s->context, s); - o->callback = (pa_operation_callback) cb; + o->callback = (pa_operation_callback_t) cb; o->userdata = userdata; t = pa_tagstruct_new(NULL, 0); @@ -680,7 +680,7 @@ pa_operation* pa_stream_get_latency_info(pa_stream *s, void (*cb)(pa_stream *p, PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction != PA_STREAM_UPLOAD, PA_ERR_BADSTATE); o = pa_operation_new(s->context, s); - o->callback = (pa_operation_callback) cb; + o->callback = (pa_operation_callback_t) cb; o->userdata = userdata; t = pa_tagstruct_new(NULL, 0); @@ -830,7 +830,7 @@ pa_operation* pa_stream_cork(pa_stream *s, int b, void (*cb) (pa_stream*s, int s o = pa_operation_new(s->context, s); assert(o); - o->callback = (pa_operation_callback) cb; + o->callback = (pa_operation_callback_t) cb; o->userdata = userdata; t = pa_tagstruct_new(NULL, 0); @@ -854,7 +854,7 @@ static pa_operation* stream_send_simple_command(pa_stream *s, uint32_t command, assert(s && s->ref >= 1 && s->state == PA_STREAM_READY); o = pa_operation_new(s->context, s); - o->callback = (pa_operation_callback) cb; + o->callback = (pa_operation_callback_t) cb; o->userdata = userdata; t = pa_tagstruct_new(NULL, 0); @@ -896,7 +896,7 @@ pa_operation* pa_stream_set_name(pa_stream *s, const char *name, void(*cb)(pa_st o = pa_operation_new(s->context, s); assert(o); - o->callback = (pa_operation_callback) cb; + o->callback = (pa_operation_callback_t) cb; o->userdata = userdata; t = pa_tagstruct_new(NULL, 0); @@ -978,9 +978,16 @@ pa_usec_t pa_stream_get_latency(pa_stream *s, const pa_latency_info *i, int *neg const pa_sample_spec* pa_stream_get_sample_spec(pa_stream *s) { assert(s); + return &s->sample_spec; } +const pa_channel_map* pa_stream_get_channel_map(pa_stream *s) { + assert(s); + + return &s->channel_map; +} + void pa_stream_trash_ipol(pa_stream *s) { assert(s); -- cgit