X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=46b3ece763aaed16f8de964a40d5c5c91d10eaf2;hp=da590dcdcaf251800feca76546e873bd1fddd999;hb=ccf42979a31a56e991b5c6d7d4043381f7487d6e;hpb=9230155e692c3a2303a267759183dd1ad264dda1 diff --git a/ortp_send.c b/ortp_send.c index da590dcd..46b3ece7 100644 --- a/ortp_send.c +++ b/ortp_send.c @@ -123,16 +123,18 @@ static void ortp_shutdown_targets(void) list_for_each_entry_safe(ot, tmp, &targets, node) { if (!ot->session || !ot->streaming) continue; - PARA_INFO_LOG("sending eof to ortp target %s:%d, ts = %d\n", TARGET_ADDR(ot), ot->port, - ot->last_ts); - rtp_session_send_with_ts(ot->session, buf, ORTP_AUDIO_HEADER_LEN, ot->last_ts + ot->chunk_ts); + PARA_INFO_LOG("sending eof to ortp target %s:%d, ts = %d\n", + TARGET_ADDR(ot), ot->port, ot->last_ts); + rtp_session_send_with_ts(ot->session, buf, + ORTP_AUDIO_HEADER_LEN, ot->last_ts); ot->streaming = 0; ot->chunk_ts = 0; rtp_session_reset(ot->session); } } -static int need_extra_header(struct audio_format *af, long unsigned chunks_sent) +static int need_extra_header(struct audio_format_handler *af, + long unsigned chunks_sent) { /* FIXME: No need to compute this on every run */ int mod = conf.ortp_header_interval_arg / (tv2ms(&af->chunk_tv) + 1); @@ -141,7 +143,7 @@ static int need_extra_header(struct audio_format *af, long unsigned chunks_sent) return 1; } -static void ortp_send(struct audio_format *af, long unsigned current_chunk, +static void ortp_send(struct audio_format_handler *af, long unsigned current_chunk, long unsigned chunks_sent, const char *buf, size_t len) { struct ortp_target *ot, *tmp; @@ -288,7 +290,7 @@ success: } } -static void ortp_pre_select(__a_unused struct audio_format *af, +static void ortp_pre_select(__a_unused struct audio_format_handler *af, __a_unused int *max_fileno, __a_unused fd_set *rfds, __a_unused fd_set *wfds) {