diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-11-14 00:04:51 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-11-14 00:04:51 +0000 |
| commit | d7d8529c4654a6681b8e5e40dface6cd774f0231 (patch) | |
| tree | 9bc8ac83b60dd05fb4669222d182664ecf647147 | |
| parent | 6de0cdaaa9eb7d64c915bada450d3afc8746dd9c (diff) | |
* remove as superfluous assert() in polyplib-stream which broke the gstreamer plugin
* fix module-tunnel meta info
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@282 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | polyp/module-tunnel.c | 4 | ||||
| -rw-r--r-- | polyp/polyplib-stream.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/polyp/module-tunnel.c b/polyp/module-tunnel.c index c899929f..712ec359 100644 --- a/polyp/module-tunnel.c +++ b/polyp/module-tunnel.c @@ -50,11 +50,11 @@ #ifdef TUNNEL_SINK #include "module-tunnel-sink-symdef.h" PA_MODULE_DESCRIPTION("Tunnel module for sinks") -PA_MODULE_USAGE("server=<filename> sink=<remote sink name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> sink_name=<name for the local sink>") +PA_MODULE_USAGE("server=<address> sink=<remote sink name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> sink_name=<name for the local sink>") #else #include "module-tunnel-source-symdef.h" PA_MODULE_DESCRIPTION("Tunnel module for sources") -PA_MODULE_USAGE("server=<filename> source=<remote source name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> source_name=<name for the local source>") +PA_MODULE_USAGE("server=<address> source=<remote source name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> source_name=<name for the local source>") #endif PA_MODULE_AUTHOR("Lennart Poettering") diff --git a/polyp/polyplib-stream.c b/polyp/polyplib-stream.c index 312f1deb..b1f19855 100644 --- a/polyp/polyplib-stream.c +++ b/polyp/polyplib-stream.c @@ -351,8 +351,8 @@ void pa_stream_write(struct pa_stream *s, const void *data, size_t length, void } size_t pa_stream_writable_size(struct pa_stream *s) { - assert(s && s->state == PA_STREAM_READY && s->ref >= 1); - return s->requested_bytes; + assert(s && s->ref >= 1); + return s->state == PA_STREAM_READY ? s->requested_bytes : 0; } struct pa_operation * pa_stream_drain(struct pa_stream *s, void (*cb) (struct pa_stream*s, int success, void *userdata), void *userdata) { |