Commit 4b016caf authored by Warren Dukes's avatar Warren Dukes

wee bit of code cleanup

git-svn-id: https://svn.musicpd.org/mpd/trunk@3021 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 8e634b82
...@@ -254,8 +254,10 @@ static int oss_playAudio(AudioOutput * audioOutput, char * playChunk, ...@@ -254,8 +254,10 @@ static int oss_playAudio(AudioOutput * audioOutput, char * playChunk,
while (size > 0) { while (size > 0) {
ret = write(od->fd, playChunk, size); ret = write(od->fd, playChunk, size);
if(errno == EINTR) continue;
if(ret<0) { if(ret<0) {
ERROR("closing audio device due to write error\n"); ERROR("closing oss device \"%s\" due to write error: "
"%s\n", od->device, strerror(errno));
oss_closeDevice(audioOutput); oss_closeDevice(audioOutput);
return -1; return -1;
} }
......
...@@ -320,7 +320,7 @@ static void finishEncoder(ShoutData * sd) { ...@@ -320,7 +320,7 @@ static void finishEncoder(ShoutData * sd) {
} }
static int flushEncoder(ShoutData * sd) { static int flushEncoder(ShoutData * sd) {
return !(ogg_stream_pageout(&sd->os, &sd->og) <= 0 ); return (ogg_stream_pageout(&sd->os, &sd->og) > 0);
} }
static void clearEncoder(ShoutData * sd) { static void clearEncoder(ShoutData * sd) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment