X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=7892fb14656317453304b37d4c09dcb8bcc40006;hp=a3c2e65063d267c26b20597f7ae5e1f8c81c24dc;hb=434b32087a9e2d54ca88072ca798a703a2ff629f;hpb=fd7ddaebab6613627a070e8867ace2f2eb3d4cc3

diff --git a/vss.c b/vss.c
index a3c2e650..7892fb14 100644
--- a/vss.c
+++ b/vss.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file vss.c the virtual streaming system
@@ -158,6 +146,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 +158,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 +171,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);
 	}
 }
@@ -275,7 +267,7 @@ static void vss_get_audio_file(void)
 		}
 		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 */
@@ -408,7 +400,7 @@ 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 || !map || !mmd->afi.header_len)
 		return NULL;
@@ -516,7 +508,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())