X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=e1e4ead542519ade73e2e5122a54cd4ba44fc7a4;hp=8e9c17bf48a623bd883274ce5f58dfd6a463f264;hb=2bca38fbb97e6c5371591eb754b79cc12525aba0;hpb=3450a4ee2962926a58b0e48bb19f8a7544450518

diff --git a/vss.c b/vss.c
index 8e9c17bf..e1e4ead5 100644
--- a/vss.c
+++ b/vss.c
@@ -158,6 +158,10 @@ void vss_init(void)
 {
 	int i;
 	char *hn = para_hostname(), *home = para_homedir();
+	long unsigned announce_time = conf.announce_time_arg > 0?
+			conf.announce_time_arg : 300,
+		autoplay_delay = conf.autoplay_delay_arg > 0?
+			conf.autoplay_delay_arg : 0;
 
 	PARA_DEBUG_LOG("supported audio formats: %s\n",
 		SUPPORTED_AUDIO_FORMATS);
@@ -166,7 +170,7 @@ void vss_init(void)
 			afl[i].name);
 		afl[i].init(&afl[i]);
 	}
-	ms2tv(conf.announce_time_arg, &announce_tv);
+	ms2tv(announce_time, &announce_tv);
 	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
 	for (i = 0; senders[i].name; i++) {
 		PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name);
@@ -179,7 +183,7 @@ void vss_init(void)
 		mmd->vss_status_flags |= VSS_PLAYING;
 		mmd->new_vss_status_flags |= VSS_PLAYING;
 		gettimeofday(&now, NULL);
-		ms2tv(conf.autoplay_delay_arg, &tmp);
+		ms2tv(autoplay_delay, &tmp);
 		tv_add(&now, &tmp, &autoplay_barrier);
 	}
 }
@@ -268,15 +272,17 @@ static void vss_get_audio_file(void)
 		audio_file = open(sl[i], O_RDONLY);
 		if (audio_file < 0)
 			continue;
-		if (fstat(audio_file, &file_status) == -1) {
+		if (fstat(audio_file, &file_status) == -1 ||
+				!file_status.st_size) {
 			close(audio_file);
 			continue;
 		}
 		mmd->size = file_status.st_size;
 		mmd->mtime = file_status.st_mtime;
-		map = para_mmap(file_status.st_size, PROT_READ, MAP_PRIVATE,
+		map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
 			audio_file, 0);
 		strcpy(mmd->filename, sl[i]);
+		mmd->afi.header_len = 0; /* default: no header */
 		if (update_mmd() < 0) { /* invalid file */
 			close(audio_file);
 			munmap(map, mmd->size);
@@ -383,8 +389,6 @@ static void vss_eof(void)
 	mmd->afi.seconds_total = 0;
 	free(mmd->afi.chunk_table);
 	mmd->afi.chunk_table = NULL;
-	free(mmd->afi.header);
-	mmd->afi.header = NULL;
 	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
 		status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
 	strcpy(mmd->afi.info_string, tmp);
@@ -408,12 +412,12 @@ static void vss_eof(void)
  * treamtment.
  *
  */
-char *vss_get_header(int *header_len)
+char *vss_get_header(unsigned *header_len)
 {
-	if (mmd->audio_format < 0)
+	if (mmd->audio_format < 0 || !map || !mmd->afi.header_len)
 		return NULL;
 	*header_len = mmd->afi.header_len;
-	return mmd->afi.header;
+	return map + mmd->afi.header_offset;
 }
 
 /**
@@ -516,7 +520,8 @@ void vss_send_chunk(void)
 {
 	int i;
 	struct audio_format_handler *af;
-	ssize_t pos, len;
+	ssize_t pos;
+	size_t len;
 	struct timeval now, due;
 
 	if (mmd->audio_format < 0 || !map || !vss_playing())