mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* remove as superfluous assert() in polyplib-stream which broke the gstreamer plugin

Browse source 
* fix module-tunnel meta info


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@282 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-11-14 00:04:51 +00:00
parent 6de0cdaaa9
commit d7d8529c46
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
polyp/module-tunnel.c
View file

@ -50,11 +50,11 @@
#ifdef TUNNEL_SINK #ifdef TUNNEL_SINK
#include "module-tunnel-sink-symdef.h" #include "module-tunnel-sink-symdef.h"
PA_MODULE_DESCRIPTION("Tunnel module for sinks") 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 #else
#include "module-tunnel-source-symdef.h" #include "module-tunnel-source-symdef.h"
PA_MODULE_DESCRIPTION("Tunnel module for sources") 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 #endif
PA_MODULE_AUTHOR("Lennart Poettering") PA_MODULE_AUTHOR("Lennart Poettering")

4
polyp/polyplib-stream.c
View file

@ -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) { size_t pa_stream_writable_size(struct pa_stream *s) {
assert(s && s->state == PA_STREAM_READY && s->ref >= 1); assert(s && s->ref >= 1);
return s->requested_bytes; 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) { struct pa_operation * pa_stream_drain(struct pa_stream *s, void (*cb) (struct pa_stream*s, int success, void *userdata), void *userdata) {