X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Flinuxplay.c;h=f5fe236c32097bc27c070fffd5d1ce6e50c54b11;hb=0a7e8462acb4861fe3fc2193319cec3552ea1c2f;hp=8c04648f17a545087d8aea3301d5508dbd38db34;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/src/linuxplay.c b/src/linuxplay.c
index 8c04648..f5fe236 100644
--- a/src/linuxplay.c
+++ b/src/linuxplay.c
@@ -65,7 +65,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/signal.h>
@@ -820,7 +820,7 @@ static int audio_init(int mixx_fd, int auddio_fd, int fmt, int speed,
     perror("SNDCTL_DSP_SYNC");
     return(0); }
 
-  /* Initialize sound hardware with prefered parameters */
+  /* Initialize sound hardware with preferred parameters */
 
   /* If the sound hardware cannot support 16 bit format or requires a
      different byte sex then try to drop to 8 bit format */
@@ -993,9 +993,8 @@ static void linux_play_data_or_file(int fd,unsigned char *data,
       return; }
 
   /* The VoxWare-SDK discourages opening /dev/audio; opening /dev/dsp and
-     properly intializing it via ioctl() is prefered */
-  if ((audio_fd=open(audio_dev,
-		     (O_WRONLY|O_NDELAY),0)) < 0) {
+     properly initializing it via ioctl() is preferred */
+  if ((audio_fd=open(audio_dev, O_WRONLY | O_NONBLOCK, 0)) < 0) {
     perror(audio_dev);
     if (mix_fd > 0 && mix_fd != audio_fd) { close(mix_fd); mix_fd = -1; }
     return; }