X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=0f4cd20e889811a6cbf466ba2e35990915b02e76;hp=6dac43d79a61a8d3b7d041c406af2eed61b14028;hb=12b81c91b25b9d0d4bce43c4f87220c3c7f991da;hpb=f7212adf2159341127331436d2ddc9e1f7a21563

diff --git a/afs.c b/afs.c
index 6dac43d7..0f4cd20e 100644
--- a/afs.c
+++ b/afs.c
@@ -38,7 +38,7 @@ static struct timeval data_send_barrier;
 static struct timeval eof_barrier;
 
 extern struct misc_meta_data *mmd;
-extern struct audio_file_selector dblist[];
+extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 extern struct gengetopt_args_info conf;
 
@@ -150,7 +150,7 @@ void afs_init(void)
 		afl[i].init(&afl[i]);
 	}
 	ms2tv(conf.announce_time_arg, &announce_tv);
-	PARA_INFO_LOG("announce timeval: %lu:%lu\n", announce_tv.tv_sec, announce_tv.tv_usec);
+	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
 	for (i = 0; senders[i].name; i++) {
 		PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name);
 		senders[i].init(&senders[i]);
@@ -233,7 +233,7 @@ static int update_mmd(void)
 
 static void get_song(void)
 {
-	char **sl = dblist[mmd->selector_num].get_audio_file_list(10);
+	char **sl = selectors[mmd->selector_num].get_audio_file_list(10);
 	int i;
 
 	if (!sl)
@@ -253,8 +253,8 @@ static void get_song(void)
 			continue;
 		}
 		mmd->num_played++;
-		if (dblist[mmd->selector_num].update_audio_file)
-			dblist[mmd->selector_num].update_audio_file(sl[i]);
+		if (selectors[mmd->selector_num].update_audio_file)
+			selectors[mmd->selector_num].update_audio_file(sl[i]);
 		PARA_DEBUG_LOG("%s", "success\n");
 		mmd->new_afs_status_flags &= (~AFS_NEXT);
 		gettimeofday(&now, NULL);