chiark
/
gitweb
/
~mdw
/
disorder
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24fc5e5
)
minor oss support corrections
author
Richard Kettlewell
<rjk@greenend.org.uk>
Thu, 4 Oct 2007 12:32:28 +0000
(13:32 +0100)
committer
Richard Kettlewell
<rjk@greenend.org.uk>
Thu, 4 Oct 2007 12:32:28 +0000
(13:32 +0100)
server/speaker-oss.c
patch
|
blob
|
blame
|
history
diff --git
a/server/speaker-oss.c
b/server/speaker-oss.c
index f9a298cc0d26a28af71a7bad8fe26ebabca8b591..9f409d5d24793e7fd071c4203fc5bde4f659abdc 100644
(file)
--- a/
server/speaker-oss.c
+++ b/
server/speaker-oss.c
@@
-71,6
+71,10
@@
static void oss_activate(void) {
device = "/dev/dsp";
else if(access("/dev/audio", W_OK) == 0)
device = "/dev/audio";
+ else {
+ error(0, "cannot determine default OSS device");
+ goto failed;
+ }
} else
device = config->device; /* just believe the user */
/* Open the device */
@@
-111,8
+115,10
@@
static void oss_activate(void) {
return;
failed:
device_state = device_error;
- if(ossfd >= 0)
+ if(ossfd >= 0)
{
xclose(ossfd);
+ ossfd = -1;
+ }
}
/** @brief Play via OSS */