X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=3c566227f0925006a0501ec0ec2e8e5d48dd21bc;hb=d85f74ca004d40e251d58ce8eed31e6786a6a6a3;hp=fbe740a892b9108a6fa4ac5b78421c79f6bc3631;hpb=13f8214c662144b2afa5c9fbf3cf2fbe1e9a36f0;p=paraslash.git

diff --git a/vss.c b/vss.c
index fbe740a8..3c566227 100644
--- a/vss.c
+++ b/vss.c
@@ -29,8 +29,6 @@
 #include "ipc.h"
 #include "fd.h"
 
-extern const char *status_item_list[];
-
 static struct timeval announce_tv;
 static struct timeval data_send_barrier;
 static struct timeval eof_barrier;
@@ -167,8 +165,7 @@ static struct timeval *vss_compute_timeout(void)
 	if (!vss_playing() || !map)
 		return NULL;
 	vss_next_chunk_time(&next_chunk);
-	if (chk_barrier(audio_format_name(mmd->afd.afsi.audio_format_id),
-			&now, &next_chunk, &the_timeout, 0) < 0)
+	if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
 		return &the_timeout;
 	/* chunk is due or bof */
 	the_timeout.tv_sec = 0;
@@ -196,16 +193,12 @@ static void vss_eof(void)
 	mmd->afd.afhi.seconds_total = 0;
 	free(mmd->afd.afhi.chunk_table);
 	mmd->afd.afhi.chunk_table = NULL;
-	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
-		status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
+	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
+		status_item_list[SI_TAG_INFO1], status_item_list[SI_TAG_INFO2]);
 	strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
 	mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';
 	free(tmp);
-	mmd->afd.path[0] = '\0';
-	mmd->afd.afsi.lyrics_id = 0;
-	mmd->afd.afsi.image_id = 0;
 	mmd->mtime = 0;
-	mmd->afd.attributes_string[0] = '\0';
 	mmd->size = 0;
 	mmd->events++;
 }
@@ -385,8 +378,6 @@ static void recv_afs_result(void)
 	if (ret < 0)
 		goto err;
 	shm_destroy(shmid);
-	PARA_NOTICE_LOG("next audio file: %s (%lu chunks)\n", mmd->afd.path,
-		mmd->afd.afhi.chunks_total);
 	ret = fstat(passed_fd, &statbuf);
 	if (ret < 0) {
 		PARA_ERROR_LOG("fstat error:\n");