Source code reorganization:

[disorder] / server / speaker-oss.c

diff --git a/server/speaker-oss.c b/server/speaker-oss.c
index 69322ff73157da1f3e383518d5dd04d2660e0db9..95dcfe397cad023129ad9721ba48fd7807d0c582 100644 (file)
--- a/server/speaker-oss.c
+++ b/server/speaker-oss.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -21,15 +21,12 @@
 /** @file server/speaker-oss.c
  * @brief Support for @ref BACKEND_OSS */
 
-#include <config.h>
+#include "common.h"
 
 #if HAVE_SYS_SOUNDCARD_H
 
-#include "types.h"
-
 #include <unistd.h>
 #include <poll.h>
-#include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
@@ -73,7 +70,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