X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=269c0e0c4ac2d8ff1ed4c329db168fa26f869671;hb=8970261c6574f5a46941308ac68a17dc01bbd11f;hp=6304fc531d63e5dbbfca69d2bec9bcac60c419d0;hpb=b27f3e8dd53af7209626a9f0e98eb4770602c2e7;p=paraslash.git

diff --git a/vss.c b/vss.c
index 6304fc53..269c0e0c 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"
@@ -336,8 +338,6 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 	/* setup group timing */
 	tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp);
 	tv_add(&fc->stream_start, &tmp, &g->start);
-	if (g->num) /* quick hack to avoid buffer underruns */
-		g->start.tv_sec--;
 	tv_scale(g->num_chunks, chunk_tv, &tmp); /* group duration */
 	tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
 		&tmp, &g->slice_duration);
@@ -486,8 +486,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;
@@ -629,10 +628,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++;
@@ -781,7 +776,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;
@@ -956,7 +950,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;