X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=a8984a488421717b2173b94c4da3866aa6e2d766;hp=6db42bdec7356b15a9f971fee16023b947efa13b;hb=659fbb8272a8bbb45e361207628b11382c99df93;hpb=3f9051d22fcf6e968259946eaf521ac3daac470e

diff --git a/vss.c b/vss.c
index 6db42bde..a8984a48 100644
--- a/vss.c
+++ b/vss.c
@@ -11,7 +11,9 @@
  * senders.
  */
 
+#include <regex.h>
 #include <dirent.h>
+#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -499,8 +501,7 @@ static void compute_slice_timeout(struct timeval *timeout)
 static void set_eof_barrier(struct vss_task *vsst)
 {
 	struct fec_client *fc;
-	struct timeval timeout = mmd->afd.afhi.eof_tv,
-		*chunk_tv = vss_chunk_time();
+	struct timeval timeout = {1, 0}, *chunk_tv = vss_chunk_time();
 
 	if (!chunk_tv)
 		goto out;
@@ -642,10 +643,6 @@ static void vss_eof(struct vss_task *vsst)
 	mmd->afd.afhi.chunk_tv.tv_usec = 0;
 	free(mmd->afd.afhi.chunk_table);
 	mmd->afd.afhi.chunk_table = NULL;
-	free(mmd->afd.afhi.info_string);
-	mmd->afd.afhi.info_string = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
-	make_empty_status_items(mmd->afd.verbose_ls_output);
 	mmd->mtime = 0;
 	mmd->size = 0;
 	mmd->events++;
@@ -794,7 +791,6 @@ static void recv_afs_result(struct vss_task *vsst)
 	if (passed_fd < 0)
 		goto err;
 	shmid = afs_data;
-	free(mmd->afd.afhi.info_string);
 	ret = load_afd(shmid, &mmd->afd);
 	if (ret < 0)
 		goto err;
@@ -971,7 +967,6 @@ void init_vss_task(int afs_socket)
 	free(hn);
 	free(home);
 	mmd->sender_cmd_data.cmd_num = -1;
-	make_empty_status_items(mmd->afd.verbose_ls_output);
 	if (conf.autoplay_given) {
 		struct timeval tmp;
 		mmd->vss_status_flags |= VSS_PLAYING;