X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=6aa82e448b558c4b4068daaed70c8930d1f1e9e3;hp=285215f9557454fff5c536a7f483185a6958604e;hb=f5a29040feebefcec4472a67b3396b6bfae84f33;hpb=61e14be5d56d3076f727227cefd3dbf08d6e7644

diff --git a/http_send.c b/http_send.c
index 285215f9..6aa82e44 100644
--- a/http_send.c
+++ b/http_send.c
@@ -206,9 +206,8 @@ static int send_queued_packets(struct http_client *hc)
 	return 1;
 }
 
-static void http_send(__a_unused struct audio_format *af,
-		long unsigned current_chunk,
-		__a_unused long unsigned chunks_sent, const char *buf, size_t len)
+static void http_send( long unsigned current_chunk,
+	__a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
 	struct http_client *hc, *tmp;
 	int ret;
@@ -218,12 +217,10 @@ static void http_send(__a_unused struct audio_format *af,
 				hc->status != HTTP_READY_TO_STREAM)
 			continue;
 		if (hc->status == HTTP_READY_TO_STREAM) {
-			if (af->get_header_info && current_chunk) {
+			int hlen;
+			char *buf = afs_get_header(&hlen);
+			if (buf && hlen > 0 && current_chunk) {
 				/* need to send header */
-				int hlen;
-				char *buf = af->get_header_info(&hlen);
-				if (!buf || hlen <= 0)
-					continue; /* header not yet available */
 				PARA_INFO_LOG("queueing header: %d\n", hlen);
 				if (queue_packet(hc, buf, hlen) < 0)
 					continue;
@@ -267,8 +264,7 @@ static int host_in_access_perm_list(struct http_client *hc)
 	return 0;
 }
 
-static void http_post_select(__a_unused struct audio_format *af, fd_set *rfds,
-		fd_set *wfds)
+static void http_post_select(fd_set *rfds, fd_set *wfds)
 {
 	int i = -1, match;
 	struct http_client *hc, *tmp;
@@ -347,8 +343,7 @@ err_out:
 	free(hc);
 }
 
-static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rfds,
-		fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
 	struct http_client *hc, *tmp;
 
@@ -373,7 +368,7 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf
 			hc->check_w = 1;
 			break;
 		case HTTP_SENT_OK_MSG:
-			if (!af || !afs_playing())
+			if (!afs_playing())
 				break; /* wait until server starts playing */
 			para_fd_set(hc->fd, wfds, max_fileno);
 			hc->check_w = 1;
@@ -561,6 +556,6 @@ void http_send_init(struct sender *s)
 	self = s;
 	init_access_control_list();
 	if (!conf.http_no_autostart_given)
-		open_tcp_port(conf.http_port_arg);
+		open_tcp_port(conf.http_port_arg); /* ignore errors */
 	PARA_DEBUG_LOG("%s", "http sender init complete\n");
 }