X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/819f5988d32fdaa25588018e71227961529bd23a..e7eb3a2744aa45179daea235800753d3d1955338:/server/speaker.c
diff --git a/server/speaker.c b/server/speaker.c
index 7411a8e..00fc276 100644
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -1,22 +1,20 @@
/*
* This file is part of DisOrder
- * Copyright (C) 2005, 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2005-2008 Richard Kettlewell
* Portions (C) 2007 Mark Wooding
*
- * 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.c
* @brief Speaker process
@@ -35,7 +33,7 @@
* this is arranged by the @c disorder-normalize program (see @ref
* server/normalize.c).
*
- * @b Garbage @b Collection. This program deliberately does not use the
+7 * @b Garbage @b Collection. This program deliberately does not use the
* garbage collector even though it might be convenient to do so. This is for
* two reasons. Firstly some sound APIs use thread threads and we do not want
* to have to deal with potential interactions between threading and garbage
@@ -50,19 +48,14 @@
* 2-byte samples.
*/
-#include
-#include "types.h"
+#include "common.h"
#include
-#include
-#include
#include
#include
#include
#include
#include
-#include
-#include
#include
#include
#include
@@ -80,6 +73,7 @@
#include "user.h"
#include "speaker.h"
#include "printf.h"
+#include "version.h"
/** @brief Linked list of all prepared tracks */
struct track *tracks;
@@ -142,13 +136,6 @@ static void help(void) {
exit(0);
}
-/* Display version number and terminate. */
-static void version(void) {
- xprintf("%s", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
/** @brief Return the number of bytes per frame in @p format */
static size_t bytes_per_frame(const struct stream_header *format) {
return format->channels * format->bits / 8;
@@ -620,7 +607,7 @@ int main(int argc, char **argv) {
while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version("disorder-speaker");
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'D': debugging = 0; break;