[polypaudio-commits] r679 - in /trunk/src/polyp: context.c stream.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Mon Apr 10 22:38:58 2006
New Revision: 679

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=679&root=polypaudio&view=rev
Log:
validity checks for pa_context_is_pending()

Modified:
    trunk/src/polyp/context.c
    trunk/src/polyp/stream.c

Modified: trunk/src/polyp/context.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/context.c?rev=679&root=polypaudio&r1=678&r2=679&view=diff
==============================================================================
--- trunk/src/polyp/context.c (original)
+++ trunk/src/polyp/context.c Mon Apr 10 22:38:58 2006
@@ -728,9 +728,8 @@
     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;

Modified: trunk/src/polyp/stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/stream.c?rev=679&root=polypaudio&r1=678&r2=679&view=diff
==============================================================================
--- trunk/src/polyp/stream.c (original)
+++ trunk/src/polyp/stream.c Mon Apr 10 22:38:58 2006
@@ -1235,5 +1235,3 @@
 
     return &s->channel_map;
 }
-
-