~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sensitize icons according to current user rights. There's up to 10s
[disorder]
/
server
/
speaker-oss.c
diff --git
a/server/speaker-oss.c
b/server/speaker-oss.c
index
9f409d5
..
95dcfe3
100644
(file)
--- a/
server/speaker-oss.c
+++ b/
server/speaker-oss.c
@@
-1,6
+1,7
@@
/*
* This file is part of DisOrder
/*
* This file is part of DisOrder
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 Richard Kettlewell
+ * Portions copyright (C) 2007 Ross Younger
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-20,15
+21,12
@@
/** @file server/speaker-oss.c
* @brief Support for @ref BACKEND_OSS */
/** @file server/speaker-oss.c
* @brief Support for @ref BACKEND_OSS */
-#include
<config.h>
+#include
"common.h"
#if HAVE_SYS_SOUNDCARD_H
#if HAVE_SYS_SOUNDCARD_H
-#include "types.h"
-
#include <unistd.h>
#include <poll.h>
#include <unistd.h>
#include <poll.h>
-#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
@@
-72,7
+70,12
@@
static void oss_activate(void) {
else if(access("/dev/audio", W_OK) == 0)
device = "/dev/audio";
else {
else if(access("/dev/audio", W_OK) == 0)
device = "/dev/audio";
else {
- error(0, "cannot determine default OSS device");
+ static int reported;
+
+ if(!reported) {
+ error(0, "cannot determine default OSS device");
+ reported = 1;
+ }
goto failed;
}
} else
goto failed;
}
} else
@@
-142,7
+145,7
@@
static size_t oss_play(size_t frames) {
static int oss_slot;
/** @brief Fill in poll fd array for OSS */
static int oss_slot;
/** @brief Fill in poll fd array for OSS */
-static void oss_beforepoll(
void
) {
+static void oss_beforepoll(
int attribute((unused)) *timeoutp
) {
oss_slot = addfd(ossfd, POLLOUT|POLLERR);
}
oss_slot = addfd(ossfd, POLLOUT|POLLERR);
}