X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=f6ec83934d971d3f6de50c363e9c15bb7c94866c;hp=84f5ada55626e8f446458fff1fba17b1973fb66d;hb=0b8b2469b5d2b81ff928bddd10d4ac3b819b75f8;hpb=0b786d977ded3c3922e851e5b8d60837b43469b9

diff --git a/vss.c b/vss.c
index 84f5ada5..f6ec8393 100644
--- a/vss.c
+++ b/vss.c
@@ -25,8 +25,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
@@ -35,11 +35,6 @@
 #include "fd.h"
 
 extern struct misc_meta_data *mmd;
-
-extern void dccp_send_init(struct sender *);
-extern void http_send_init(struct sender *);
-extern void udp_send_init(struct sender *);
-
 extern const struct sender udp_sender, dccp_sender, http_sender;
 const struct sender * const senders[] = {
 	&http_sender, &dccp_sender, &udp_sender, NULL};
@@ -283,7 +278,7 @@ static int initialize_fec_client(struct fec_client *fc, struct vss_task *vsst)
 	if (fcp->init_fec) {
 		/*
 		 * Set the maximum slice size to the Maximum Packet Size if the
-		 * transport protocol allows to determine this value. The user
+		 * transport protocol allows determination of this value. The user
 		 * can specify a slice size up to this value.
 		 */
 		ret = fcp->init_fec(fc->sc);
@@ -1083,6 +1078,11 @@ static int vss_post_select(struct sched *s, void *context)
 	int ret, i;
 	struct vss_task *vsst = context;
 
+	ret = task_get_notification(vsst->task);
+	if (ret < 0) {
+		afh_free_header(vsst->header_buf, mmd->afd.audio_format_id);
+		return ret;
+	}
 	if (!vsst->map || vss_next() || vss_paused() || vss_repos()) {
 		/* shut down senders and fec clients */
 		struct fec_client *fc, *tmp;
@@ -1185,3 +1185,20 @@ void vss_init(int afs_socket, struct sched *s)
 		.context = vsst,
 	}, s);
 }
+
+/**
+ * Turn off the virtual streaming system.
+ *
+ * This is only executed on exit. It calls the ->shutdowwn method of all senders.
+ */
+void vss_shutdown(void)
+{
+	int i;
+
+	FOR_EACH_SENDER(i) {
+		if (!senders[i]->shutdown)
+			continue;
+		PARA_NOTICE_LOG("shutting down %s sender\n", senders[i]->name);
+		senders[i]->shutdown();
+	}
+}