X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=1bd74de69f6d83f0f4e2ef2b28fe3c657d107f17;hb=e59019f183e080486fda280868cf4669955148c2;hp=f92e15e0d653ada1f541975876d77384ba3c5b57;hpb=753b26859be2150d3f4e7840a86412f96f60627a;p=paraslash.git

diff --git a/vss.c b/vss.c
index f92e15e0..1bd74de6 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -32,7 +32,7 @@ extern struct misc_meta_data *mmd;
 
 extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
-extern void ortp_send_init(struct sender *);
+extern void udp_send_init(struct sender *);
 
 /** The list of supported senders. */
 struct sender senders[] = {
@@ -44,12 +44,10 @@ struct sender senders[] = {
 		.name = "dccp",
 		.init = dccp_send_init,
 	},
-#ifdef HAVE_ORTP
 	{
-		.name = "ortp",
-		.init = ortp_send_init,
+		.name = "udp",
+		.init = udp_send_init,
 	},
-#endif
 	{
 		.name = NULL,
 	}
@@ -238,6 +236,8 @@ struct timeval *vss_chunk_time(void)
 
 static int need_to_request_new_audio_file(struct vss_task *vsst)
 {
+	struct timeval diff;
+
 	if (vsst->map) /* have audio file */
 		return 0;
 	if (!vss_playing()) /* don't need one */
@@ -246,6 +246,9 @@ static int need_to_request_new_audio_file(struct vss_task *vsst)
 		return 0;
 	if (vsst->afsss == AFS_SOCKET_AFD_PENDING) /* already requested one */
 		return 0;
+	if (chk_barrier("autoplay_delay", &vsst->autoplay_barrier,
+			&diff, 1) < 0)
+		return 0;
 	return 1;
 }
 
@@ -288,7 +291,6 @@ static void vss_pre_select(struct sched *s, struct task *t)
 		mmd->current_chunk = mmd->repos_request;
 		mmd->new_vss_status_flags &= ~VSS_REPOS;
 	}
-
 	if (need_to_request_new_audio_file(vsst)) {
 		PARA_DEBUG_LOG("ready and playing, but no audio file\n");
 		para_fd_set(vsst->afs_socket, &s->wfds, &s->max_fileno);
@@ -379,7 +381,6 @@ static void recv_afs_result(struct vss_task *vsst)
 	mmd->events++;
 	mmd->num_played++;
 	mmd->new_vss_status_flags &= (~VSS_NEXT);
-	tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
 	afh_get_header(&mmd->afd.afhi, vsst->map, &vsst->header_buf,
 		&vsst->header_len);
 	return;
@@ -418,7 +419,6 @@ static void vss_send_chunk(struct vss_task *vsst)
 	if (chk_barrier("data send", &vsst->data_send_barrier,
 			&due, 1) < 0)
 		return;
-	mmd->new_vss_status_flags &= ~VSS_REPOS;
 	if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
 		mmd->new_vss_status_flags |= VSS_NEXT;
 		return;
@@ -469,6 +469,9 @@ static void vss_post_select(struct sched *s, struct task *t)
 			continue;
 		senders[i].post_select(&s->rfds, &s->wfds);
 	}
+	if ((vss_playing() && !(mmd->vss_status_flags & VSS_PLAYING)) ||
+			(vss_next() && vss_playing()))
+		tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
 	vss_send_chunk(vsst);
 }
 
@@ -502,12 +505,15 @@ 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;
 		mmd->new_vss_status_flags |= VSS_PLAYING;
 		ms2tv(autoplay_delay, &tmp);
 		tv_add(now, &tmp, &vsst->autoplay_barrier);
+		tv_add(&vsst->autoplay_barrier, &vsst->announce_tv,
+			&vsst->data_send_barrier);
 	}
 	register_task(&vsst->task);
 }