Start reimplenting search in Disobedience choose tabs. Results are

[disorder] / server / decode.c

diff --git a/server/decode.c b/server/decode.c
index b609d4e6eab48491f3dd2905878bb65ef310b755..3a1e1a9f6a891b41105875cf42defe6c2c954e55 100644 (file)
--- a/server/decode.c
+++ b/server/decode.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 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


@@ -21,20 +21,10 @@
  * @brief General-purpose decoder for use by speaker process
  */
 
  * @brief General-purpose decoder for use by speaker process
  */
 

-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <assert.h>
-#include <fnmatch.h>
+#include "disorder-server.h"
+

 #include <mad.h>
 #include <vorbis/vorbisfile.h>
 #include <mad.h>
 #include <vorbis/vorbisfile.h>

-#include <string.h>

 
 /* libFLAC has had an API change and stupidly taken away the old API */
 #if HAVE_FLAC_FILE_DECODER_H
 
 /* libFLAC has had an API change and stupidly taken away the old API */
 #if HAVE_FLAC_FILE_DECODER_H


@@ -45,9 +35,6 @@
 #define FLAC__FileDecoderState FLAC__StreamDecoderState
 #endif
 
 #define FLAC__FileDecoderState FLAC__StreamDecoderState
 #endif
 

-#include "log.h"
-#include "syscalls.h"
-#include "defs.h"

 #include "wav.h"
 #include "speaker-protocol.h"
 
 #include "wav.h"
 #include "speaker-protocol.h"
 


@@ -444,13 +431,6 @@ static void help(void) {
   exit(0);
 }
 
   exit(0);
 }
 

-/* Display version number and terminate. */
-static void version(void) {
-  xprintf("%s", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-

 int main(int argc, char **argv) {
   int n;
   const char *e;
 int main(int argc, char **argv) {
   int n;
   const char *e;


@@ -460,7 +440,7 @@ int main(int argc, char **argv) {
   while((n = getopt_long(argc, argv, "hV", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
   while((n = getopt_long(argc, argv, "hV", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();

-    case 'V': version();
+    case 'V': version("disorder-decode");

     default: fatal(0, "invalid option");
     }
   }
     default: fatal(0, "invalid option");
     }
   }