X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=d1cf538360dfa8c09cd42bfae1368a2115f85573;hp=51db7686c6b008c2ac8704967d9cdfd7ea76e071;hb=6ada557fe7963d41fbcfe1dd12b320fcd1a0c36c;hpb=4ad8a5536d7cea1e63137933b242c52e57bd53d6

diff --git a/vss.c b/vss.c
index 51db7686..d1cf5383 100644
--- a/vss.c
+++ b/vss.c
@@ -19,7 +19,9 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
+#include "server.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "portable_io.h"
@@ -29,7 +31,6 @@
 #include "afs.h"
 #include "server.h"
 #include "net.h"
-#include "server.cmdline.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
@@ -611,7 +612,7 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 		for (; i < k; i++)
 			fc->src_data[i] = (const unsigned char *)buf;
 	}
-	PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), %d bytes\n",
+	PARA_DEBUG_LOG("FEC group %u: %u chunks (%u - %u), %u bytes\n",
 		g->num, g->num_chunks, g->first_chunk,
 		g->first_chunk + g->num_chunks - 1, g->bytes
 	);
@@ -1027,7 +1028,7 @@ static void vss_send(struct vss_task *vsst)
 		}
 		if (compute_next_fec_slice(fc, vsst) <= 0)
 			continue;
-		PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num,
+		PARA_DEBUG_LOG("sending %u:%u (%u bytes)\n", fc->group.num,
 			fc->current_slice_num, fc->group.slice_bytes);
 		fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
 			fc->group.slice_bytes + FEC_HEADER_SIZE);
@@ -1166,10 +1167,8 @@ void init_vss_task(int afs_socket, struct sched *s)
 	static struct vss_task vss_task_struct, *vsst = &vss_task_struct;
 	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;
+	long unsigned announce_time = OPT_UINT32_VAL(ANNOUNCE_TIME),
+		autoplay_delay = OPT_UINT32_VAL(AUTOPLAY_DELAY);
 	vsst->header_interval.tv_sec = 5; /* should this be configurable? */
 	vsst->afs_socket = afs_socket;
 	ms2tv(announce_time, &vsst->announce_tv);
@@ -1182,12 +1181,12 @@ void init_vss_task(int afs_socket, struct sched *s)
 	free(hn);
 	free(home);
 	mmd->sender_cmd_data.cmd_num = -1;
-	if (conf.autoplay_given) {
+	if (OPT_GIVEN(AUTOPLAY)) {
 		struct timeval tmp;
 		mmd->vss_status_flags |= VSS_PLAYING;
 		mmd->new_vss_status_flags |= VSS_PLAYING;
 		ms2tv(autoplay_delay, &tmp);
-		tv_add(now, &tmp, &vsst->autoplay_barrier);
+		tv_add(clock_get_realtime(NULL), &tmp, &vsst->autoplay_barrier);
 		tv_add(&vsst->autoplay_barrier, &vsst->announce_tv,
 			&vsst->data_send_barrier);
 	}