X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=6fd8eef15a5b3c5f0c07c16795155daa63691ddc;hp=df725f96f216afe425e12ec14f0a7a9beba4178b;hb=3e3c069366dbb2bf8f157ad0a406bda67dd51783;hpb=8d7bdabd22ed7750086ca660754d8d881dae3832

diff --git a/audiod.c b/audiod.c
index df725f96..6fd8eef1 100644
--- a/audiod.c
+++ b/audiod.c
@@ -144,6 +144,8 @@ void para_log(int ll, const char* fmt,...)
 
 	if (ll < conf.loglevel_arg)
 		return;
+	if (!logfile && conf.daemon_given)
+		return;
 	if (!hostname)
 		hostname = para_hostname();
 	outfd = logfile? logfile : stderr;
@@ -431,23 +433,18 @@ static int receiver_running(int format)
 
 static int open_current_receiver(struct sched *s)
 {
-	int i;
 	struct timeval diff;
-	char *audio_format = stat_task->stat_item_values[SI_FORMAT];
+	int cafn = stat_task->current_audio_format_num;
 
-	if (!audio_format || !stat_task->pcd)
-		return 0;
-	i = get_audio_format_num(audio_format + strlen(
-		status_item_list[SI_FORMAT]) + 1);
-	if (i < 0)
+	if (cafn < 0 || !stat_task->pcd)
 		return 0;
-	if (receiver_running(i))
+	if (receiver_running(cafn))
 		return 0;
-	if (tv_diff(now, &afi[i].restart_barrier, &diff) < 0) {
+	if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
 		s->timeout = diff;
 		return 0;
 	}
-	return open_receiver(i) < 0? 0 : 1;
+	return open_receiver(cafn) < 0? 0 : 1;
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)
@@ -551,6 +548,9 @@ static int check_stat_line(char *line, __a_unused void *data)
 		if (stat_task->clock_diff_count)
 			stat_task->clock_diff_count--;
 		break;
+	case SI_FORMAT:
+		stat_task->current_audio_format_num = get_audio_format_num(
+			line + ilen + 1);
 	}
 	return 1;
 }
@@ -601,6 +601,8 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 		a = &afi[sl->format];
 		if (!sl->receiver_node)
 			continue;
+		if ((!a->num_filters || sl->fc) && sl->wng)
+			continue; /* everything already started */
 		if (!a->num_filters) {
 			if (sl->receiver_node->loaded && !sl->wng) {
 				open_writers(i);
@@ -613,7 +615,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 			s->timeout = min_delay;
 			continue;
 		}
-		if (!sl->fc || !*sl->fc->out_loaded || sl->wng)
+		if (sl->wng || !sl->fc || !*sl->fc->out_loaded)
 			continue;
 		if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
 			open_writers(i);
@@ -1089,6 +1091,7 @@ static void init_status_task(struct status_task *st)
 	st->task.private_data = st;
 	st->sa_time_diff_sign = 1;
 	st->clock_diff_count = conf.clock_diff_count_arg;
+	st->current_audio_format_num = -1;
 	sprintf(st->task.status, "status task");
 }
 
@@ -1106,7 +1109,7 @@ static void set_initial_status(void)
 		return;
 	}
 	if (strcmp(conf.mode_arg, "on"))
-		PARA_WARNING_LOG("%s", "invalid mode\n");
+		PARA_WARNING_LOG("invalid mode\n");
 }
 
 /**
@@ -1141,7 +1144,7 @@ int main(int argc, char *argv[])
 
 		};
 		if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
-			PARA_EMERG_LOG("%s", "parse error in config file\n");
+			PARA_EMERG_LOG("parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}
 		free(config_file);