X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=94134b515bcebebaf1410d8afbbc2c8ecb06b0ed;hp=5415929bde788fffc9de6297d23bb1cde1f29ad6;hb=5e5f74a84cb23f5584e799e09ff76ea50f9a35fe;hpb=5913ef464aff461a76f3656916265d81de91a9ae

diff --git a/vss.c b/vss.c
index 5415929b..94134b51 100644
--- a/vss.c
+++ b/vss.c
@@ -164,6 +164,19 @@ const char *audio_format_name(int i)
 	return i >= 0?  afl[i].name : "(none)";
 }
 
+static void afh_init(void)
+{
+	int i;
+
+	PARA_DEBUG_LOG("supported audio formats: %s\n",
+		SUPPORTED_AUDIO_FORMATS);
+	FOR_EACH_AUDIO_FORMAT(i) {
+		PARA_NOTICE_LOG("initializing %s handler\n",
+			audio_format_name(i));
+		afl[i].init(&afl[i]);
+	}
+}
+
 /**
  * initialize the virtual streaming system
  *
@@ -178,14 +191,7 @@ void vss_init(void)
 			conf.announce_time_arg : 300,
 		autoplay_delay = conf.autoplay_delay_arg > 0?
 			conf.autoplay_delay_arg : 0;
-
-	PARA_DEBUG_LOG("supported audio formats: %s\n",
-		SUPPORTED_AUDIO_FORMATS);
-	FOR_EACH_AUDIO_FORMAT(i) {
-		PARA_NOTICE_LOG("initializing %s handler\n",
-			afl[i].name);
-		afl[i].init(&afl[i]);
-	}
+	afh_init();
 	ms2tv(announce_time, &announce_tv);
 	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
 	for (i = 0; senders[i].name; i++) {
@@ -322,7 +328,7 @@ static struct timeval *vss_compute_timeout(void)
 	if (mmd->audio_format < 0 || !vss_playing() || !map)
 		return NULL;
 	vss_next_chunk_time(&next_chunk);
-	if (chk_barrier(afl[mmd->audio_format].name, &now, &next_chunk,
+	if (chk_barrier(audio_format_name(mmd->audio_format), &now, &next_chunk,
 			&the_timeout, 0) < 0)
 		return &the_timeout;
 	/* chunk is due or bof */