X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=546056a04282b9b87c27b9a4cfb811fd005f761d;hp=7fad4f7d7acb4b150719f5453af5e2f3e987f1ee;hb=f3ebfd3dcb117f1c4a91c2c9f08d8ed710ee3907;hpb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632

diff --git a/dccp_send.c b/dccp_send.c
index 7fad4f7d..546056a0 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -50,7 +50,7 @@ struct dccp_client {
 	int header_sent;
 };
 
-static void dccp_pre_select(__a_unused struct audio_format *af, int *max_fileno, fd_set *rfds,
+static void dccp_pre_select( int *max_fileno, fd_set *rfds,
 		__a_unused fd_set *wfds)
 {
 	if (listen_fd < 0)
@@ -59,8 +59,7 @@ static void dccp_pre_select(__a_unused struct audio_format *af, int *max_fileno,
 	*max_fileno = PARA_MAX(*max_fileno, listen_fd);
 }
 
-static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds,
-		__a_unused fd_set *wfds)
+static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct dccp_client *dc;
 	int ret;
@@ -133,8 +132,7 @@ err_out:
 	return -E_DCCP_WRITE;
 }
 
-static void dccp_send(__a_unused struct audio_format *af,
-		long unsigned current_chunk,
+static void dccp_send(long unsigned current_chunk,
 		__a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
 	struct dccp_client *dc, *tmp;
@@ -152,8 +150,8 @@ static void dccp_send(__a_unused struct audio_format *af,
 		}
 		if (!ret)
 			continue;
-		if (!dc->header_sent && af->get_header_info && current_chunk) {
-			header_buf = af->get_header_info(&header_len);
+		if (!dc->header_sent && current_chunk) {
+			header_buf = afs_get_header(&header_len);
 			if (!header_buf || header_len <= 0)
 				continue; /* header not yet available */
 			ret = dccp_write(dc->fd, header_buf, header_len);
@@ -234,8 +232,9 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_DELETE] = NULL;
 	self = s;
 	ret = dccp_open();
-	if (ret < 0)
+	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	else
+		s->status = SENDER_OFF;
+	} else
 		s->status = SENDER_ON;
 }