X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=audiod.c;h=701f827848b112b735e3fa16cae371934200e8a8;hb=2fe91861ddba9c5aa75109b4fe3504d998eaf330;hp=df725f96f216afe425e12ec14f0a7a9beba4178b;hpb=8d7bdabd22ed7750086ca660754d8d881dae3832;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index df725f96..701f8278 100644
--- a/audiod.c
+++ b/audiod.c
@@ -431,23 +431,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 +546,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;
 }
@@ -1089,6 +1087,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");
 }