X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afh_recv.c;h=6a0ec239bbcbd120efd130b5f8f24c2b136d4516;hb=5dcb47606caf94ba1fe3a07f7795890fda3bdcee;hp=e5e87bddbc798b7dc5af2b40b2de8df4602ba58f;hpb=25ca76ec354120efa561879f50c486340e14d0ca;p=paraslash.git diff --git a/afh_recv.c b/afh_recv.c index e5e87bdd..6a0ec239 100644 --- a/afh_recv.c +++ b/afh_recv.c @@ -174,6 +174,7 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context) char *buf; const char *start; size_t size; + uint32_t len; struct timeval chunk_time; unsigned j_given = RECV_CMD_OPT_GIVEN(AFH, JUST_IN_TIME, lpr); unsigned H_given = RECV_CMD_OPT_GIVEN(AFH, NO_HEADER, lpr); @@ -197,12 +198,12 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context) long unsigned n; for (n = pard->first_chunk; n < pard->last_chunk; n++) { ret = afh_get_chunk(n, afhi, pard->audio_format_num, - pard->map, pard->map_size, &start, &size, + pard->map, pard->map_size, &start, &len, &pard->afh_context); if (ret < 0) goto out; - PARA_DEBUG_LOG("adding %zu bytes\n", size); - btr_add_output_dont_free(start, size, btrn); + PARA_DEBUG_LOG("adding %u bytes\n", len); + btr_add_output_dont_free(start, len, btrn); } ret = -E_RECV_EOF; goto out; @@ -218,12 +219,12 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context) } ret = afh_get_chunk(pard->current_chunk, afhi, pard->audio_format_num, pard->map, - pard->map_size, &start, &size, + pard->map_size, &start, &len, &pard->afh_context); if (ret < 0) goto out; PARA_DEBUG_LOG("adding chunk %u\n", pard->current_chunk); - btr_add_output_dont_free(start, size, btrn); + btr_add_output_dont_free(start, len, btrn); if (pard->current_chunk >= pard->last_chunk) { ret = -E_RECV_EOF; goto out; @@ -238,7 +239,6 @@ out: return ret; } -/** See \ref recv_init(). */ const struct receiver lsg_recv_cmd_com_afh_user_data = { .open = afh_recv_open, .close = afh_recv_close,