}
list_del(&hc->node);
free(hc);
- return;
}
static void http_shutdown_clients_real(void)
{
struct http_client *hc, *tmp;
list_for_each_entry_safe(hc, tmp, &clients, node)
- if (hc->status == HTTP_STREAMING)
- http_shutdown_client(hc, "afs request");
+ http_shutdown_client(hc, "afs request");
}
static int http_send_msg(struct http_client *hc, const char *msg)
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;
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;
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;
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;
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;
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");
}