X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c62ae9477861a63b7958b58384bfbffb11c37347..812b526d127c6657e571db8b33a58137af6709cd:/server/speaker-oss.c
diff --git a/server/speaker-oss.c b/server/speaker-oss.c
index 9f409d5..a84d0bb 100644
--- a/server/speaker-oss.c
+++ b/server/speaker-oss.c
@@ -1,34 +1,30 @@
/*
* 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
/** @file server/speaker-oss.c
* @brief Support for @ref BACKEND_OSS */
-#include
+#include "common.h"
#if HAVE_SYS_SOUNDCARD_H
-#include "types.h"
-
#include
#include
-#include
#include
#include
#include
@@ -72,7 +68,12 @@ static void oss_activate(void) {
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
@@ -142,7 +143,7 @@ static size_t oss_play(size_t frames) {
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);
}