# HG changeset patch
# User nathan
# Date 1233635333 -28800
# Node ID e47abd1f520ff9e7e742b363e7431d98b8689b8d
# Parent  3f59412204dfb7fd362d420ec710f48adddf2fb6
use blocking IO for OSS output

diff -r 3f59412204df -r e47abd1f520f HISTORY
--- a/HISTORY	Tue Jan 20 17:23:54 2009 +0100
+++ b/HISTORY	Tue Feb 03 12:28:53 2009 +0800
@@ -9,6 +9,8 @@
 - Added commandline option for a user defined default background image.
 - Map audio-button to "switch_audio" slave command in MPlayer replay. Suggested
   by Martin Dauskardt.
+- Use blocking IO for OSS output for improved compatibility. Suggested by Martin
+  Dauskardt.
 - Backward compatible on-the-fly creation of the i18n.c file using Udo Richter's
   po2i18n package.
 - Added italian translations.
diff -r 3f59412204df -r e47abd1f520f player-mp3.c
--- a/player-mp3.c	Tue Jan 20 17:23:54 2009 +0100
+++ b/player-mp3.c	Tue Feb 03 12:28:53 2009 +0800
@@ -1408,14 +1408,21 @@
 
 cOutputOss::~cOutputOss()
 {
-  close(fd);
+  if(fd>=0) close(fd);
 }
 
 void cOutputOss::Init(void)
 {
   if(fd<0) {
     fd=open(dspdevice,O_WRONLY|O_NONBLOCK);
-    if(fd>=0) poll.Add(fd,true);
+    if(fd>=0) {
+      if(fcntl(fd,F_SETFL,0)==0)
+        poll.Add(fd,true);
+      else {
+        esyslog("ERROR: Cannot make dsp device '%s' blocking: %s!",dspdevice,strerror(errno));
+        close(fd); fd=-1;
+        }
+      }
     else esyslog("ERROR: Cannot open dsp device '%s': %s!",dspdevice,strerror(errno));
     }
   cOutput::Init();
@@ -1484,9 +1491,12 @@
       n=FHS;
       Data+=n; Len-=n;
       }
-    int r=write(fd,Data,Len);
-    if(r<0 && !FATALERRNO) r=0;
-    if(r>=0) return n+r;
+    if(poll.Poll(0)) {
+      int r=write(fd,Data,Len);
+      if(r<0 && FATALERRNO) return -1;
+      if(r>0) n+=r;
+      }
+    return n;
     }
   return -1;
 }