X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=3db8bb446f447dbe4e2441af67f6c5944eb15ac8;hp=3d54f16cc0e6911f26ed9500832540f0b164a273;hb=da0a1b59045898dd73d6737ccd4f4af6fb29ad7f;hpb=94e85c0e9e9493004b9b1ce3f3b1c78fd2d682be

diff --git a/vss.c b/vss.c
index 3d54f16c..3db8bb44 100644
--- a/vss.c
+++ b/vss.c
@@ -24,7 +24,6 @@
 #include "server.h"
 #include "net.h"
 #include "server.cmdline.h"
-#include "afs_common.h"
 #include "vss.h"
 #include "send.h"
 #include "ipc.h"
@@ -38,10 +37,8 @@ static struct timeval eof_barrier;
 static struct timeval autoplay_barrier;
 
 extern struct misc_meta_data *mmd;
-extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 
-static int audio_file;
 static char *map;
 
 /**
@@ -103,7 +100,6 @@ void vss_init(void)
 			conf.announce_time_arg : 300,
 		autoplay_delay = conf.autoplay_delay_arg > 0?
 			conf.autoplay_delay_arg : 0;
-	afh_init();
 	ms2tv(announce_time, &announce_tv);
 	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
 	for (i = 0; senders[i].name; i++) {
@@ -196,7 +192,6 @@ static void vss_eof(void)
 	tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
 	munmap(map, mmd->size);
 	map = NULL;
-	close(audio_file);
 	mmd->audio_format = -1;
 	mmd->chunks_sent = 0;
 	mmd->offset = 0;
@@ -392,6 +387,7 @@ static void recv_afs_result(void)
 		mmd->afd.afhi.chunks_total);
 	ret = fstat(passed_fd, &statbuf);
 	if (ret < 0) {
+		PARA_ERROR_LOG("fstat error:\n");
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err;
 	}
@@ -399,6 +395,7 @@ static void recv_afs_result(void)
 	mmd->mtime = statbuf.st_mtime;
 	map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
 		passed_fd, 0);
+	close(passed_fd);
 	strcpy(mmd->filename, mmd->afd.path); /* FIXME: check length */
 	mmd->afi.header_len = 0; /* default: no header */
 	mmd->audio_format = mmd->afd.afsi.audio_format_id;