X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2f9d5da3dbd6cc486dcc468d55bbbda7b0b41b6e;hp=40443a612569988e00ade13c8f384a7090d133e3;hb=1ada5f286b031bde90d5cdaf8f85311cbfa7db6b;hpb=bb3daee7cc11561159f168fe4f5427b53e54917f

diff --git a/audiod.c b/audiod.c
index 40443a61..2f9d5da3 100644
--- a/audiod.c
+++ b/audiod.c
@@ -309,7 +309,7 @@ static int get_play_time_slot_num(void)
  */
 char *get_time_string(void)
 {
-	int ret, seconds = 0, length;
+	int ret, seconds = 0, length = stat_task->length_seconds;
 	struct timeval *tmp, sum, sss, /* server stream start */
 		rstime, /* receiver start time */
 		wstime, /* writer start time */
@@ -321,19 +321,18 @@ char *get_time_string(void)
 
 	if (audiod_status == AUDIOD_OFF)
 		goto empty;
-	if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) {
-		if (stat_task->length_seconds) /* paused */
+	if (stat_task->server_stream_start.tv_sec == 0) {
+		if (stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)
+			goto out; /* server is about to change file */
+		if (length > 0) /* paused */
 			return NULL;
 		goto empty; /* stopped */
 	}
-	if (audiod_status == AUDIOD_ON && !s)
-		goto empty;
 	/*
 	 * Valid status items and playing, set length and tmp to the stream
 	 * start. We use the slot info and fall back to the info from current
 	 * status items if no slot info is available.
 	 */
-	length = stat_task->length_seconds;
 	tmp = &stat_task->server_stream_start;
 	if (s && s->wns && s->wns[0].btrn) { /* writer active in this slot */
 		btr_get_node_start(s->wns[0].btrn, &wstime);
@@ -352,7 +351,7 @@ char *get_time_string(void)
 		tv_diff(tmp, &stat_task->sa_time_diff, &sss);
 	else
 		tv_add(tmp, &stat_task->sa_time_diff, &sss);
-	if (!s || !s->wns || !s->wns[0].btrn) {
+	if (!s || !s->wns || !s->wns[0].btrn || wstime.tv_sec == 0) {
 		struct timeval diff;
 		tv_diff(now, &sss, &diff);
 		seconds = diff.tv_sec + stat_task->offset_seconds;
@@ -364,7 +363,8 @@ char *get_time_string(void)
 	if (s->receiver_node->btrn) {
 		btr_get_node_start(s->receiver_node->btrn, &rstime);
 		ret = tv_diff(&rstime, &sss, &rskip);
-		if (ret > 0) { /* audiod was started in the middle of the stream */
+		if (ret > 0 && rskip.tv_sec > 2) {
+			/* audiod was started in the middle of the stream */
 			tv_add(&wtime, &rskip, &sum);
 			seconds += sum.tv_sec;
 		} else
@@ -525,11 +525,11 @@ static void close_filters(struct slot_info *s)
 		return;
 	for (i = a->num_filters - 1; i >= 0; i--) {
 		struct filter_node *fn = s->fns + i;
-		struct filter *f;
+		const struct filter *f;
 
 		if (!fn)
 			continue;
-		f = filters + fn->filter_num;
+		f = filter_get(fn->filter_num);
 		if (f->close)
 			f->close(fn);
 		btr_remove_node(&fn->btrn);
@@ -588,7 +588,7 @@ static void open_filters(struct slot_info *s)
 	parent = s->receiver_node->btrn;
 	for (i = 0; i < nf; i++) {
 		char buf[20];
-		struct filter *f = filters + a->filter_nums[i];
+		const struct filter *f = filter_get(a->filter_nums[i]);
 		fn = s->fns + i;
 		fn->filter_num = a->filter_nums[i];
 		fn->conf = a->filter_conf[i];
@@ -858,7 +858,7 @@ static int add_filter(int format, char *cmdline)
 	a->filter_conf[nf] = cfg;
 	a->num_filters++;
 	PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
-		filters[filter_num].name);
+		filter_get(filter_num)->name);
 	return filter_num;
 }
 
@@ -993,20 +993,20 @@ static int init_default_filters(void)
 		}
 		/* add "dec" to audio format name */
 		tmp = make_message("%sdec", audio_formats[i]);
-		for (j = 0; filters[j].name; j++)
-			if (!strcmp(tmp, filters[j].name))
+		for (j = 0; filter_get(j); j++)
+			if (!strcmp(tmp, filter_get(j)->name))
 				break;
 		free(tmp);
 		ret = -E_UNSUPPORTED_FILTER;
-		if (!filters[j].name)
+		if (!filter_get(j))
 			goto out;
-		tmp = para_strdup(filters[j].name);
+		tmp = para_strdup(filter_get(j)->name);
 		ret = add_filter(i, tmp);
 		free(tmp);
 		if (ret < 0)
 			goto out;
 		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
-			filters[j].name);
+			filter_get(j)->name);
 	}
 out:
 	return ret;
@@ -1072,7 +1072,7 @@ static void init_local_sockets(struct command_task *ct)
 		unlink(socket_name);
 	ct->fd[0] = create_local_socket(socket_name, 0);
 	ct->fd[1] = create_local_socket(socket_name,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 	if (ct->fd[0] >= 0 || ct->fd[1] >= 0)
 		return;
 	PARA_EMERG_LOG("%s\n", para_strerror(-ct->fd[1]));
@@ -1230,10 +1230,15 @@ static void close_slot(int slot_num)
 static void close_unused_slots(void)
 {
 	int i;
+	bool dump = false;
 
 	FOR_EACH_SLOT(i)
-		if (must_close_slot(i))
+		if (must_close_slot(i)) {
 			close_slot(i);
+			dump = true;
+		}
+	if (dump)
+		audiod_status_dump(true);
 }
 
 /*
@@ -1278,6 +1283,7 @@ static void start_stop_decoders(void)
 	open_writers(sl);
 	activate_grab_clients(&sched);
 	btr_log_tree(sl->receiver_node->btrn, LL_NOTICE);
+	audiod_status_dump(true);
 }
 
 static void status_pre_select(struct sched *s, void *context)
@@ -1474,6 +1480,7 @@ int main(int argc, char *argv[])
 	writer_init();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
+	daemon_set_priority(conf.priority_arg);
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
 	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
@@ -1493,7 +1500,7 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_log_welcome("para_audiod");
+	daemon_log_welcome("audiod");
 	daemon_set_start_time();
 	set_initial_status();
 	FOR_EACH_SLOT(i)