X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=bf11dc9b8e82c06c78a684e983836fc4348090d7;hp=aab051690fd9d9d4e0f71394e99f056c70f6f3c9;hb=99daab96f932309995188ee7f7618c036994eb46;hpb=00581ce02d1b5391569c8f3fc7739274b31bacf8

diff --git a/vss.c b/vss.c
index aab05169..bf11dc9b 100644
--- a/vss.c
+++ b/vss.c
@@ -167,8 +167,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;
@@ -201,11 +200,7 @@ static void vss_eof(void)
 	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++;
 }
@@ -321,7 +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)) {
-		if (afsss == AFS_SOCKET_READY) {
+		if (afsss == AFS_SOCKET_READY ||
+				afsss == AFS_SOCKET_CHECK_FOR_WRITE) {
 			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;
@@ -384,8 +380,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");
@@ -397,7 +391,6 @@ static void recv_afs_result(void)
 	map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
 		passed_fd, 0);
 	close(passed_fd);
-	mmd->afd.afhi.header_len = 0; /* default: no header */
 	mmd->chunks_sent = 0;
 	mmd->current_chunk = 0;
 	mmd->offset = 0;