X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=546056a04282b9b87c27b9a4cfb811fd005f761d;hp=855780e6cd6a691be9dbaf1200e2c40f8fda3872;hb=2a8029478dfc65f0c935d864faf4aea9e3deb27d;hpb=db34194eaab9819772bd55ea1ab08c719ed8f1c8 diff --git a/dccp_send.c b/dccp_send.c index 855780e6..546056a0 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -50,8 +50,8 @@ struct dccp_client { int header_sent; }; -static void dccp_pre_select(__a_unused struct audio_format_handler *af, - int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds) +static void dccp_pre_select( int *max_fileno, fd_set *rfds, + __a_unused fd_set *wfds) { if (listen_fd < 0) return; @@ -59,8 +59,7 @@ static void dccp_pre_select(__a_unused struct audio_format_handler *af, *max_fileno = PARA_MAX(*max_fileno, listen_fd); } -static void dccp_post_select(__a_unused struct audio_format_handler *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_handler *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_handler *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);