X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_recv.c;h=d2d8b52bb86d18d70d356fdcb43044b064590de6;hp=b76c405a47c686ad5eec5d0e4c569101ff83738a;hb=463b82370e584a8b871311583bf9657cadd1b6cc;hpb=fc8dfbb416ff07cca08fbf4e13efcaa25e17cc54

diff --git a/afh_recv.c b/afh_recv.c
index b76c405a..d2d8b52b 100644
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -31,6 +31,7 @@ struct private_afh_recv_data {
 	long unsigned last_chunk;
 	struct timeval stream_start;
 	uint32_t current_chunk;
+	void *afh_context;
 };
 
 static int afh_execute(struct btr_node *btrn, const char *cmd, char **result)
@@ -58,7 +59,8 @@ static int afh_execute(struct btr_node *btrn, const char *cmd, char **result)
 			return ret;
 		if (x >= pard->afhi.chunks_total)
 			return -ERRNO_TO_PARA_ERROR(EINVAL);
-		pard->first_chunk = afh_get_start_chunk(x, &pard->afhi);
+		pard->first_chunk = afh_get_start_chunk(x, &pard->afhi,
+			pard->audio_format_num);
 		pard->current_chunk = pard->first_chunk;
 		return 1;
 	}
@@ -94,10 +96,11 @@ static int afh_recv_open(struct receiver_node *rn)
 	if (PARA_ABS(bc) >= afhi->chunks_total)
 		goto out_clear_afhi;
 	if (bc >= 0)
-		pard->first_chunk = afh_get_start_chunk(bc, &pard->afhi);
+		pard->first_chunk = afh_get_start_chunk(bc, &pard->afhi,
+			pard->audio_format_num);
 	else
 		pard->first_chunk = afh_get_start_chunk(afhi->chunks_total + bc,
-			&pard->afhi);
+			&pard->afhi, pard->audio_format_num);
 	if (lls_opt_given(r_e)) {
 		int32_t ec = lls_int32_val(0, r_e);
 		ret = -ERRNO_TO_PARA_ERROR(EINVAL);
@@ -134,6 +137,7 @@ static void afh_recv_close(struct receiver_node *rn)
 	clear_afhi(&pard->afhi);
 	para_munmap(pard->map, pard->map_size);
 	close(pard->fd);
+	afh_close(pard->afh_context, pard->audio_format_num);
 	freep(&rn->private_data);
 }
 
@@ -167,7 +171,7 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 	struct afh_info *afhi = &pard->afhi;
 	int ret;
 	char *buf;
-	const char *start, *end;
+	const char *start;
 	size_t size;
 	struct timeval chunk_time;
 	unsigned j_given = RECV_CMD_OPT_GIVEN(AFH, JUST_IN_TIME, lpr);
@@ -189,11 +193,16 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 		}
 	}
 	if (!j_given) {
-		afh_get_chunk(pard->first_chunk, afhi, pard->map, &start, &size);
-		afh_get_chunk(pard->last_chunk, afhi, pard->map, &end, &size);
-		end += size;
-		PARA_INFO_LOG("adding %td bytes\n", end - start);
-		btr_add_output_dont_free(start, end - start, btrn);
+		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->afh_context);
+			if (ret < 0)
+				goto out;
+			PARA_INFO_LOG("adding %zu bytes\n", size);
+			btr_add_output_dont_free(start, size, btrn);
+		}
 		ret = -E_RECV_EOF;
 		goto out;
 	}
@@ -206,7 +215,12 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 		if (ret > 0)
 			goto out;
 	}
-	afh_get_chunk(pard->current_chunk, afhi, pard->map, &start, &size);
+	ret = afh_get_chunk(pard->current_chunk, afhi,
+		pard->audio_format_num, pard->map,
+		pard->map_size, &start, &size,
+		&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);
 	if (pard->current_chunk >= pard->last_chunk) {
@@ -223,6 +237,7 @@ out:
 	return ret;
 }
 
+/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_afh_user_data = {
 	.init = afh_init,
 	.open = afh_recv_open,