X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b25aac593c0321473525a3e5b12f406bd3961aec..ec57f6c97b41d54ade912f7e3b9f727b40e38e16:/lib/mixer-oss.c
diff --git a/lib/mixer-oss.c b/lib/mixer-oss.c
index 7ce57be..a4ee419 100644
--- a/lib/mixer-oss.c
+++ b/lib/mixer-oss.c
@@ -1,21 +1,19 @@
/*
* This file is part of DisOrder
- * Copyright (C) 2004, 2007 Richard Kettlewell
+ * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
*
- * 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 lib/mixer-oss.c
* @brief OSS mixer support
@@ -24,17 +22,12 @@
* nonetheless).
*/
-#include
+#include "common.h"
#if HAVE_SYS_SOUNDCARD_H
-#include "types.h"
-
-#include
-#include
#include
#include
-#include
#include
#include
#include
@@ -44,6 +37,7 @@
#include "mixer.h"
#include "log.h"
#include "syscalls.h"
+#include "mem.h"
/* documentation does not match implementation! */
#ifndef SOUND_MIXER_READ
@@ -74,8 +68,16 @@ static int mixer_channel(const char *c) {
static int oss_do_open(void) {
int fd;
- if((fd = open(config->mixer, O_RDWR, 0)) < 0)
- error(errno, "error opening %s", config->mixer);
+ if((fd = open(config->mixer, O_RDWR, 0)) < 0) {
+ static char *reported;
+
+ if(!reported || strcmp(reported, config->mixer)) {
+ if(reported)
+ xfree(reported);
+ reported = xstrdup(config->mixer);
+ error(errno, "error opening %s", config->mixer);
+ }
+ }
return fd;
}