X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/eb5f83f45eb2ff415ededbb30187fec8c3e71010..3fbdc96d45fbf2abcc93ed2e8ad206bc540be92b:/server/speaker.c?ds=inline

diff --git a/server/speaker.c b/server/speaker.c
index 7411a8e..4a8966d 100644
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -35,7 +35,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
@@ -80,6 +80,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 +143,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 +614,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;