From: Lennart Poettering Date: Mon, 10 Apr 2006 20:38:58 +0000 (+0000) Subject: validity checks for pa_context_is_pending() X-Git-Tag: submit/2.0-panda/20130828.192557~3914 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a81209f147c5aa701efda0c911229a0fd6948fc9;p=profile%2Fivi%2Fpulseaudio-panda.git validity checks for pa_context_is_pending() git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@679 fefdeb5f-60dc-0310-8127-8f9354f1896f --- diff --git a/src/polyp/context.c b/src/polyp/context.c index 845e88d..6fe008e 100644 --- a/src/polyp/context.c +++ b/src/polyp/context.c @@ -728,9 +728,8 @@ int pa_context_is_pending(pa_context *c) { assert(c); assert(c->ref >= 1); -/* pa_log("pstream: %i", pa_pstream_is_pending(c->pstream)); */ -/* pa_log("pdispatch: %i", pa_pdispatch_is_pending(c->pdispatch)); */ - + PA_CHECK_VALIDITY_RETURN_ANY(c, c->state == PA_CONTEXT_READY, PA_ERR_BADSTATE, -1); + return (c->pstream && pa_pstream_is_pending(c->pstream)) || (c->pdispatch && pa_pdispatch_is_pending(c->pdispatch)) || c->client; diff --git a/src/polyp/stream.c b/src/polyp/stream.c index 0fcc36b..ca10775 100644 --- a/src/polyp/stream.c +++ b/src/polyp/stream.c @@ -1235,5 +1235,3 @@ const pa_channel_map* pa_stream_get_channel_map(pa_stream *s) { return &s->channel_map; } - -