projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(char_encode_shift_jis): Refer
[chise/xemacs-chise.git-]
/
src
/
linuxplay.c
diff --git
a/src/linuxplay.c
b/src/linuxplay.c
index
bfe3e7d
..
f5fe236
100644
(file)
--- a/
src/linuxplay.c
+++ b/
src/linuxplay.c
@@
-820,7
+820,7
@@
static int audio_init(int mixx_fd, int auddio_fd, int fmt, int speed,
perror("SNDCTL_DSP_SYNC");
return(0); }
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 */
/* 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
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; }
perror(audio_dev);
if (mix_fd > 0 && mix_fd != audio_fd) { close(mix_fd); mix_fd = -1; }
return; }