X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audioc.c;h=dabc2f77eb18d8b705241acc0753fd2fbbe34736;hb=3f696a82bbb79cb07bfdb8e510bb4f3515570cec;hp=ab7253f698946c44651325611141ec34ffeb66e1;hpb=33d9e48b9ebe11858e4fd208196c419b72db7f6d;p=paraslash.git

diff --git a/audioc.c b/audioc.c
index ab7253f6..dabc2f77 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -13,10 +13,11 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
-#include <stdbool.h>
 #include <signal.h>
 
 #include "audioc.cmdline.h"
+#include "audiod_cmd.lsg.h"
+
 #include "para.h"
 #include "error.h"
 #include "net.h"
@@ -25,7 +26,8 @@
 #include "ggo.h"
 #include "version.h"
 
-INIT_AUDIOC_ERRLISTS;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
 
 /** The gengetopt structure containing command line args. */
 static struct audioc_args_info conf;
@@ -72,7 +74,6 @@ fail:
 #include "sched.h"
 #include "buffer_tree.h"
 #include "interactive.h"
-#include "audiod_completion.h"
 
 static struct sched sched;
 
@@ -97,11 +98,20 @@ static void help_completer(struct i9e_completion_info *ci,
 	result->matches = i9e_complete_commands(ci->word, audiod_completers);
 }
 
+static void version_completer(struct i9e_completion_info *ci,
+		struct i9e_completion_result *cr)
+{
+	char *opts[] = {LSG_AUDIOD_CMD_VERSION_OPTS, NULL};
+
+	if (ci->word_num <= 2 && ci->word && ci->word[0] == '-')
+		i9e_complete_option(opts, ci, cr);
+}
+
 static void stat_completer(struct i9e_completion_info *ci,
 		struct i9e_completion_result *cr)
 {
 	char *sia[] = {STATUS_ITEM_ARRAY NULL};
-	char *opts[] = {"-p", NULL};
+	char *opts[] = {LSG_AUDIOD_CMD_STAT_OPTS, NULL};
 
 	if (ci->word_num <= 2 && ci->word && ci->word[0] == '-')
 		i9e_complete_option(opts, ci, cr);
@@ -112,18 +122,22 @@ static void stat_completer(struct i9e_completion_info *ci,
 static void grab_completer(struct i9e_completion_info *ci,
 		struct i9e_completion_result *cr)
 {
-	char *opts[] = {"-ms", "-ms", "-ma", "-p=", "-n=", "-o", NULL};
+	char *opts[] = {LSG_AUDIOD_CMD_GRAB_OPTS, NULL};
 	i9e_complete_option(opts, ci, cr);
 }
 
+I9E_DUMMY_COMPLETER(SUPERCOMMAND_UNAVAILABLE);
 static struct i9e_completer audiod_completers[] = {
-	AUDIOD_COMPLETERS
+#define LSG_AUDIOD_CMD_CMD(_name) {.name = #_name, \
+	.completer = _name ## _completer}
+	LSG_AUDIOD_CMD_SUBCOMMANDS
+#undef LSG_AUDIOD_CMD_CMD
 	{.name = NULL}
 };
 
-static void audioc_pre_select(struct sched *s, struct task *t)
+static void audioc_pre_select(struct sched *s, void *context)
 {
-	struct audioc_task *at = task_context(t);
+	struct audioc_task *at = context;
 	int ret = btr_node_status(at->btrn, 0, BTR_NT_ROOT);
 
 	if (ret < 0)
@@ -131,10 +145,10 @@ static void audioc_pre_select(struct sched *s, struct task *t)
 	para_fd_set(at->fd, &s->rfds, &s->max_fileno);
 }
 
-static int audioc_post_select(struct sched *s, struct task *t)
+static int audioc_post_select(struct sched *s, void *context)
 {
 	char *buf = NULL;
-	struct audioc_task *at = task_context(t);
+	struct audioc_task *at = context;
 	int ret = btr_node_status(at->btrn, 0, BTR_NT_ROOT);
 
 	if (ret < 0)