X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_recv.c;h=905d580e1ba4dcf00872e40cf1119878e09794bb;hp=1e440420a2e78b49a81b7d387dc8eaf3a1fd2d36;hb=95488d221ea22f761a6a4b78410c4e0e89f522b8;hpb=f4fb0289834e76a23839719ab0e89fe29b591d3f diff --git a/ortp_recv.c b/ortp_recv.c index 1e440420..905d580e 100644 --- a/ortp_recv.c +++ b/ortp_recv.c @@ -67,7 +67,7 @@ uint32_t chunk_ts; }; static int ortp_recv_pre_select(struct receiver_node *rn, - __unused fd_set *rfds, __unused fd_set *wfds, + __a_unused fd_set *rfds, __a_unused fd_set *wfds, struct timeval *timeout) { struct private_ortp_recv_data *pord = rn->private_data; @@ -83,7 +83,7 @@ static int ortp_recv_pre_select(struct receiver_node *rn, return -1; /* we did not modify the fd sets */ } -static void compute_next_chunk(struct timeval *now, unsigned chunk_time, +static void compute_next_chunk(unsigned chunk_time, struct private_ortp_recv_data *pord) { struct timeval chunk_tv = {0, chunk_time}; @@ -96,14 +96,10 @@ static void compute_next_chunk(struct timeval *now, unsigned chunk_time, pord->timestamp, pord->next_chunk.tv_sec, pord->next_chunk.tv_usec); } -/** \cond */ -#define BUF_TO_VAL(buf) (((unsigned)(buf)[1] & 0xff) + 256 \ - * ((unsigned)(buf)[0] & 0xff)) -/** \endcond */ - -static int ortp_recv_post_select(struct receiver_node *rn, int select_ret, - __unused fd_set *rfds, __unused fd_set *wfds) +static int ortp_recv_post_select(struct receiver_node *rn, + __a_unused int select_ret, __a_unused fd_set *rfds, + __a_unused fd_set *wfds) { struct private_ortp_recv_data *pord = rn->private_data; mblk_t *mp; @@ -208,7 +204,7 @@ success: pord->c_bad = 0; pord->next_chunk = now; } - compute_next_chunk(&now, chunk_time, pord); + compute_next_chunk(chunk_time, pord); return 1; err_out: freemsg(mp);