diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-01-11 20:47:10 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-01-11 20:47:10 +0000 |
commit | 32bf3a106a946303f2175f01f3124354edd95a3e (patch) | |
tree | 5e5bab6284bc2603d2acf7126eab5307d013e3fe /polyp/protocol-esound.c | |
parent | 5ab306402d9efcceb3cc7b1097602c45365f12bd (diff) |
* new environment variable $POLYP_LOG
* fix connection establishing algorithm
* add timeout for establishing connections
* add fqdn to the server directive to connect to in browse API
* quieten ESOUND protocol
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@338 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/protocol-esound.c')
-rw-r--r-- | polyp/protocol-esound.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/polyp/protocol-esound.c b/polyp/protocol-esound.c index 744ad4ed..d99b721c 100644 --- a/polyp/protocol-esound.c +++ b/polyp/protocol-esound.c @@ -764,7 +764,8 @@ static int do_read(struct connection *c) { assert(c->read_data && c->read_data_length < handler->data_length); if ((r = pa_iochannel_read(c->io, (uint8_t*) c->read_data + c->read_data_length, handler->data_length - c->read_data_length)) <= 0) { - pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno)); + if (r != 0) + pa_log_warn(__FILE__": read() failed: %s\n", strerror(errno)); return -1; } @@ -784,7 +785,8 @@ static int do_read(struct connection *c) { assert(c->scache.memchunk.memblock && c->scache.name && c->scache.memchunk.index < c->scache.memchunk.length); if ((r = pa_iochannel_read(c->io, (uint8_t*) c->scache.memchunk.memblock->data+c->scache.memchunk.index, c->scache.memchunk.length-c->scache.memchunk.index)) <= 0) { - pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno)); + if (r!= 0) + pa_log_warn(__FILE__": read() failed: %s\n", strerror(errno)); return -1; } @@ -841,7 +843,8 @@ static int do_read(struct connection *c) { } if ((r = pa_iochannel_read(c->io, (uint8_t*) c->playback.current_memblock->data+c->playback.memblock_index, l)) <= 0) { - pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno)); + if (r != 0) + pa_log(__FILE__": read() failed: %s\n", strerror(errno)); return -1; } |