X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=29a8aa30abec6be72aee946b92d7767f3fc037e5;hp=6d7cce5efdf109f251dfa112fb5ed6593d2c0d02;hb=672e27768e31a6eaa6854d4fc75ee6885db9abd8;hpb=a7f31bd369e5eda15361bef5aee2529bdb6eb89e;ds=sidebyside

diff --git a/audiod.c b/audiod.c
index 6d7cce5e..29a8aa30 100644
--- a/audiod.c
+++ b/audiod.c
@@ -8,16 +8,17 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <signal.h>
+#include <openssl/rc4.h>
 
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
 #include "recv.h"
 #include "filter.h"
-#include "grab_client.cmdline.h"
 #include "grab_client.h"
 #include "client.cmdline.h"
 #include "client.h"
@@ -49,8 +50,8 @@ struct audio_format_info {
 	void **filter_conf;
 	/** the number of filters that should be activated for this audio format */
 	unsigned int num_writers;
-	/** pointer to the array of writers to be activated */
-	struct writer **writers;
+	/** Array of writer numbers to be activated. */
+	int *writer_nums;
 	/** pointer to the array of writer configurations */
 	void **writer_conf;
 	/** do not start receiver/filters/writer before this time */
@@ -160,7 +161,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
-int get_audio_format_num(char *name)
+int get_audio_format_num(const char *name)
 {
 	int i;
 
@@ -219,8 +220,7 @@ out:
 	seconds = PARA_MIN(seconds, length);
 	seconds = PARA_MAX(seconds, 0);
 	return make_message(
-		"%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
-		status_item_list[SI_PLAY_TIME],
+		"%s%d:%02d [%d:%02d] (%d%%/%d:%02d)",
 		s? "" : "~",
 		seconds / 60,
 		seconds % 60,
@@ -231,7 +231,7 @@ out:
 		length % 60
 	);
 empty:
-	return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
+	return para_strdup(NULL);
 }
 
 static int want_colors(void)
@@ -382,7 +382,7 @@ static void open_filters(int slot_num)
 	PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
 	s->fc = para_calloc(sizeof(struct filter_chain));
 	s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_node));
-	s->fc->inbuf = s->receiver_node->buf;
+	s->fc->inbufp = &s->receiver_node->buf;
 	s->fc->in_loaded = &s->receiver_node->loaded;
 	s->fc->input_error = &s->receiver_node->task.error;
 	s->fc->task.pre_select = filter_pre_select;
@@ -402,7 +402,7 @@ static void open_filters(int slot_num)
 		f->open(fn);
 		PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
 			audio_formats[s->format], i,  nf, f->name, slot_num);
-		s->fc->outbuf = fn->buf;
+		s->fc->outbufp = &fn->buf;
 		s->fc->out_loaded = &fn->loaded;
 	}
 	register_task(&s->fc->task);
@@ -420,7 +420,7 @@ static void open_writers(int slot_num)
 	else
 		s->wng = wng_new(a->num_writers);
 	if (s->fc) {
-		s->wng->buf = s->fc->outbuf;
+		s->wng->bufp = s->fc->outbufp;
 		s->wng->loaded = s->fc->out_loaded;
 		s->wng->input_error = &s->fc->task.error;
 		s->wng->channels = &s->fc->channels;
@@ -428,25 +428,23 @@ static void open_writers(int slot_num)
 		s->fc->output_error = &s->wng->task.error;
 		PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
 	} else {
-		s->wng->buf = s->receiver_node->buf;
+		s->wng->bufp = &s->receiver_node->buf;
 		s->wng->loaded = &s->receiver_node->loaded;
 		s->wng->input_error = &s->receiver_node->task.error;
 	}
 	for (i = 0; i < a->num_writers; i++) {
 		s->wng->writer_nodes[i].conf = a->writer_conf[i];
-		s->wng->writer_nodes[i].writer = a->writers[i];
+		s->wng->writer_nodes[i].writer_num = a->writer_nums[i];
 	}
 	ret = wng_open(s->wng);
-	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	if (ret < 0)
 		return;
-	}
 	s->wstime = *now;
 	s->server_stream_start = stat_task->server_stream_start.tv_sec?
 		stat_task->server_stream_start : *now;
 	s->offset_seconds = stat_task->offset_seconds;
 	s->seconds_total = stat_task->length_seconds;
-	activate_inactive_grab_clients(slot_num, s->format, s->fc);
+	activate_inactive_grab_clients(s->format, s->fc);
 }
 
 static int open_receiver(int format)
@@ -580,45 +578,31 @@ out:
 	return count;
 }
 
-static int check_stat_line(char *line, __a_unused void *data)
+static int update_item(int itemnum, char *buf)
 {
-	int itemnum;
-	size_t ilen = 0;
 	long unsigned sec, usec;
-	char *tmp;
 
-	//PARA_INFO_LOG("line: %s\n", line);
-	if (!line)
-		return 1;
-	itemnum = stat_line_valid(line);
-	if (itemnum < 0) {
-		PARA_WARNING_LOG("invalid status line: %s\n", line);
-		return 1;
-	}
 	if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
 		return 1;
-	tmp = make_message("%s\n", line);
-	stat_client_write(tmp, itemnum);
-	free(tmp);
 	free(stat_item_values[itemnum]);
-	stat_item_values[itemnum] = para_strdup(line);
-	ilen = strlen(status_item_list[itemnum]);
+	stat_item_values[itemnum] = para_strdup(buf);
+	stat_client_write_item(itemnum);
 	switch (itemnum) {
 	case SI_STATUS_FLAGS:
 		stat_task->vss_status = 0;
-		if (strchr(line, 'N'))
+		if (strchr(buf, 'N'))
 			stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
-		if (strchr(line, 'P'))
+		if (strchr(buf, 'P'))
 			stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
 		break;
 	case SI_OFFSET:
-		stat_task->offset_seconds = atoi(line + ilen + 1);
+		stat_task->offset_seconds = atoi(buf);
 		break;
 	case SI_SECONDS_TOTAL:
-		stat_task->length_seconds = atoi(line + ilen + 1);
+		stat_task->length_seconds = atoi(buf);
 		break;
 	case SI_STREAM_START:
-		if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
+		if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
 			struct timeval a_start, delay;
 			delay.tv_sec = conf.stream_delay_arg / 1000;
 			delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
@@ -636,14 +620,14 @@ static int check_stat_line(char *line, __a_unused void *data)
 		}
 		break;
 	case SI_CURRENT_TIME:
-		if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
+		if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
 			struct timeval tv = {sec, usec};
 			compute_time_diff(&tv);
 		}
 		break;
 	case SI_FORMAT:
-		stat_task->current_audio_format_num = get_audio_format_num(
-			line + ilen + 1);
+		stat_task->current_audio_format_num
+			= get_audio_format_num(buf);
 	}
 	return 1;
 }
@@ -691,7 +675,7 @@ static int parse_writer_args(void)
 	FOR_EACH_AUDIO_FORMAT(i) {
 		a = &afi[i];
 		a->writer_conf = para_malloc(nw * sizeof(void *));
-		a->writers = para_malloc(nw * sizeof(struct writer *));
+		a->writer_nums = para_malloc(nw * sizeof(int));
 		a->num_writers = 0;
 	}
 	for (i = 0; i < conf.writer_given; i++) {
@@ -707,7 +691,7 @@ static int parse_writer_args(void)
 			ret = writer_num;
 			goto out;
 		}
-		a->writers[nw] = &writers[writer_num];
+		a->writer_nums[nw] = writer_num;
 		a->writer_conf[nw] = wconf;
 		PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
 			nw, writer_names[writer_num]);
@@ -937,17 +921,11 @@ static void init_command_task(struct command_task *ct)
 
 static void close_stat_pipe(void)
 {
-	int i;
-
 	if (!stat_task->ct)
 		return;
 	client_close(stat_task->ct);
 	stat_task->ct = NULL;
-	FOR_EACH_STATUS_ITEM(i) {
-		free(stat_item_values[i]);
-		stat_item_values[i] = NULL;
-	}
-	dump_empty_status();
+	clear_and_dump_items();
 	stat_task->length_seconds = 0;
 	stat_task->offset_seconds = 0;
 	stat_task->vss_status = 0;
@@ -1071,7 +1049,7 @@ static void status_pre_select(struct sched *s, struct task *t)
 		goto out;
 	}
 	if (st->ct) {
-		unsigned bytes_left;
+		int ret;
 		if (st->ct->task.error < 0) {
 			if (st->ct->task.error != -E_TASK_UNREGISTERED)
 				goto out;
@@ -1080,11 +1058,15 @@ static void status_pre_select(struct sched *s, struct task *t)
 		}
 		if (st->ct->status != CL_RECEIVING)
 			goto out;
-		bytes_left = for_each_line(st->ct->buf, st->ct->loaded,
-			&check_stat_line, NULL);
-		if (st->ct->loaded != bytes_left) {
+		ret = for_each_stat_item(st->ct->buf, st->ct->loaded,
+			update_item);
+		if (ret < 0) {
+			st->ct->task.error = ret;
+			goto out;
+		}
+		if (st->ct->loaded != ret) {
 			st->last_status_read = *now;
-			st->ct->loaded = bytes_left;
+			st->ct->loaded = ret;
 		} else {
 			struct timeval diff;
 			tv_diff(now, &st->last_status_read, &diff);
@@ -1096,25 +1078,23 @@ static void status_pre_select(struct sched *s, struct task *t)
 	if (tv_diff(now, &st->restart_barrier, NULL) < 0)
 		goto out;
 	if (st->clock_diff_count) { /* get status only one time */
-		char *argv[] = {"audiod", "stat", "1", NULL};
-		int argc = 3;
+		char *argv[] = {"audiod", "--", "stat", "-p", "1", NULL};
+		int argc = 5;
 		PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
 		st->clock_diff_count--;
 		client_open(argc, argv, &st->ct, NULL);
 		set_stat_task_restart_barrier(2);
 
 	} else {
-		char *argv[] = {"audiod", "stat", NULL};
-		int argc = 2;
+		char *argv[] = {"audiod", "--", "stat", "-p", NULL};
+		int argc = 4;
 		client_open(argc, argv, &st->ct, NULL);
 		set_stat_task_restart_barrier(5);
 	}
 	free(stat_item_values[SI_BASENAME]);
-	stat_item_values[SI_BASENAME] = make_message(
-		"%s: no connection to para_server\n",
-		status_item_list[SI_BASENAME]);
-	stat_client_write(stat_item_values[SI_BASENAME],
-		SI_BASENAME);
+	stat_item_values[SI_BASENAME] = para_strdup(
+		"no connection to para_server");
+	stat_client_write_item(SI_BASENAME);
 	st->last_status_read = *now;
 out:
 	start_stop_decoders(s);