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

fix hangup detection for recording streams

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@849 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-11 22:37:42 +00:00
parent eecc04cf28
commit 11782f0b74
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/polypcore/protocol-esound.c
View file

@ -58,7 +58,7 @@
#define DEFAULT_COOKIE_FILE ".esd_auth" #define DEFAULT_COOKIE_FILE ".esd_auth"
#define PLAYBACK_BUFFER_SECONDS (.5) #define PLAYBACK_BUFFER_SECONDS (.25)
#define PLAYBACK_BUFFER_FRAGMENTS (10) #define PLAYBACK_BUFFER_FRAGMENTS (10)
#define RECORD_BUFFER_SECONDS (5) #define RECORD_BUFFER_SECONDS (5)
#define RECORD_BUFFER_FRAGMENTS (100) #define RECORD_BUFFER_FRAGMENTS (100)
@ -985,7 +985,12 @@ static void do_work(struct connection *c) {
if (pa_iochannel_is_readable(c->io)) { if (pa_iochannel_is_readable(c->io)) {
if (do_read(c) < 0) if (do_read(c) < 0)
goto fail; goto fail;
} else if (pa_iochannel_is_hungup(c->io)) }
if (c->state == ESD_STREAMING_DATA && c->source_output && pa_iochannel_is_hungup(c->io))
/* In case we are in capture mode we will never call read()
* on the socket, hence we need to detect the hangup manually
* here, instead of simply waiting for read() to return 0. */
goto fail; goto fail;
if (pa_iochannel_is_writable(c->io)) if (pa_iochannel_is_writable(c->io))
@ -1008,13 +1013,10 @@ fail:
connection_free(c); connection_free(c);
} }
static void io_callback(pa_iochannel*io, void *userdata) { static void io_callback(pa_iochannel*io, void *userdata) {
struct connection *c = userdata; struct connection *c = userdata;
assert(io && c && c->io == io); assert(io && c && c->io == io);
/* pa_log("IO"); */
do_work(c); do_work(c);
} }