chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure.ac: Only look for ALSA libraries on Linux. On other platforms,
[disorder]
/
server
/
speaker.c
diff --git
a/server/speaker.c
b/server/speaker.c
index 6296169b1058d9733792b487f0cbf47876efc8d1..1593b781e3a0f23a160ccf3c32c664b3335d241c 100644
(file)
--- a/
server/speaker.c
+++ b/
server/speaker.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder
/*
* This file is part of DisOrder
- * Copyright (C) 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2005, 2006
, 2007
Richard Kettlewell
*
* 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
@@
-41,7
+41,6
@@
#include <assert.h>
#include <sys/select.h>
#include <time.h>
#include <assert.h>
#include <sys/select.h>
#include <time.h>
-#include <alsa/asoundlib.h>
#include "configuration.h"
#include "syscalls.h"
#include "configuration.h"
#include "syscalls.h"
@@
-51,6
+50,9
@@
#include "speaker.h"
#include "user.h"
#include "speaker.h"
#include "user.h"
+#if BUILD_SPEAKER
+#include <alsa/asoundlib.h>
+
#define BUFFER_SECONDS 5 /* How many seconds of input to
* buffer. */
#define BUFFER_SECONDS 5 /* How many seconds of input to
* buffer. */
@@
-622,6
+624,13
@@
int main(int argc, char **argv) {
info("stopped (parent terminated)");
exit(0);
}
info("stopped (parent terminated)");
exit(0);
}
+#else
+int main(int attribute((unused)) argc, char **argv) {
+ set_progname(argv);
+ mem_init(0);
+ fatal(0, "disorder-speaker not supported on this platform");
+}
+#endif
/*
Local Variables:
/*
Local Variables: