X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=5dce4cac9a4b1479535f742291d914f852284c94;hb=a5b65db9da1cd81c25494429ea8adb5d76e5b32a;hp=c676ead505671f1a145f950620742a299a594fb6;hpb=fa2e4b062432412b90ad7ba6e85d27764544f1c8;p=paraslash.git

diff --git a/vss.c b/vss.c
index c676ead5..5dce4cac 100644
--- a/vss.c
+++ b/vss.c
@@ -182,7 +182,6 @@ static void vss_eof(void)
 	int i;
 	char *tmp;
 
-	PARA_NOTICE_LOG("EOF\n");
 	if (!map) {
 		for (i = 0; senders[i].name; i++)
 			senders[i].shutdown_clients();
@@ -202,6 +201,10 @@ static void vss_eof(void)
 	strcpy(mmd->afd.afhi.info_string, tmp);
 	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++;
 }
@@ -313,8 +316,8 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 		return tv;
 	if (!map && vss_playing() &&
 			!(mmd->new_vss_status_flags & VSS_NOMORE)) {
-		PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n");
 		if (afsss == AFS_SOCKET_READY) {
+			PARA_DEBUG_LOG("ready and playing, but no audio file\n");
 			para_fd_set(afs_socket, wfds, max_fileno);
 			afsss = AFS_SOCKET_CHECK_FOR_WRITE;
 		}
@@ -363,11 +366,10 @@ static void recv_afs_result(void)
 	struct stat statbuf;
 	struct timeval now;
 
-	PARA_NOTICE_LOG("recv\n");
 	ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
 	if (ret < 0)
 		goto err;
-	PARA_NOTICE_LOG("got the fd: %d, code: %u, shmid: %u\n",
+	PARA_DEBUG_LOG("got the fd: %d, code: %u, shmid: %u\n",
 		passed_fd, afs_code, afs_data);
 	ret = -E_BAD_AFS_CODE;
 	if (afs_code != NEXT_AUDIO_FILE)
@@ -415,7 +417,7 @@ void vss_post_select(fd_set *rfds, fd_set *wfds)
 		recv_afs_result();
 	if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds))
 		return;
-	PARA_NOTICE_LOG("requesting new socket\n");
+	PARA_NOTICE_LOG("requesting new fd from afs\n");
 	ret = send_buffer(afs_socket, "new");
 	afsss = AFS_SOCKET_AFD_PENDING;
 }
@@ -425,10 +427,6 @@ static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
 	size_t pos = mmd->afd.afhi.chunk_table[chunk_num];
 	*buf = map + pos;
 	*len = mmd->afd.afhi.chunk_table[chunk_num + 1] - pos;
-
-	if (chunk_num + 5 > mmd->afd.afhi.chunks_total)
-		PARA_NOTICE_LOG("chunk %lu/%lu\n, len: %zu\n", chunk_num,
-			mmd->afd.afhi.chunks_total, *len);
 }
 
 /**