X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=48bfa7d75c60049b87f3bdd09906cfcb17527aac;hb=4e7459e8e12c9688805ec7c628ca8e9bb19a56e5;hp=4ed75792185f685e26db278ae88b49ff4d2cd59f;hpb=40de1dd2fdbb054444d585aa70e2d50166a66e07;p=paraslash.git

diff --git a/vss.c b/vss.c
index 4ed75792..48bfa7d7 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,
 	}
@@ -282,13 +280,11 @@ static void vss_pre_select(struct sched *s, struct task *t)
 			tv_add(&mmd->afd.afhi.eof_tv, now, &vsst->eof_barrier);
 		mmd->chunks_sent = 0;
 	} else if (vss_repos()) {
-		tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
 		tv_add(&mmd->afd.afhi.eof_tv, now, &vsst->eof_barrier);
 		mmd->chunks_sent = 0;
 		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 +375,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;
@@ -468,6 +463,8 @@ 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))
+		tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
 	vss_send_chunk(vsst);
 }