/*
* 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
* and eliminate the dependency on sox.
*/
-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <locale.h>
-#include <errno.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "syscalls.h"
-#include "log.h"
-#include "configuration.h"
-#include "speaker-protocol.h"
-#include "defs.h"
+#include "disorder-server.h"
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
exit(0);
}
-/* display version number and terminate */
-static void version(void) {
- xprintf("%s", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
/** @brief Copy bytes from one file descriptor to another
* @param infd File descriptor read from
* @param outfd File descriptor to write to
while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version("disorder-normalize");
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'D': debugging = 0; break;
}
if(outfd != -1)
xclose(outfd);
+ if(pid != -1) {
+ /* There's still a converter running */
+ if(waitpid(pid, &n, 0) < 0)
+ fatal(errno, "error calling waitpid");
+ if(n)
+ fatal(0, "sox failed: %#x", n);
+ }
return 0;
}