X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_recv.c;h=08f0d1e7c4c615ac96b8ddc27a39af41f5fa1625;hp=164634634fedbaaf5441ebdec79dcff51e24d641;hb=b6b571e6c6fb52207b11fc7833b272ec8cfa28bf;hpb=642445e95fea1c548c79f80ad3b5d6f30ba572f3

diff --git a/afh_recv.c b/afh_recv.c
index 16463463..08f0d1e7 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;
 	}
@@ -110,11 +112,12 @@ static int afh_recv_open(struct receiver_node *rn)
 		goto out_clear_afhi;
 	if (conf->begin_chunk_arg >= 0)
 		pard->first_chunk = afh_get_start_chunk(
-			conf->begin_chunk_arg, &pard->afhi);
+			conf->begin_chunk_arg, &pard->afhi,
+			pard->audio_format_num);
 	else
 		pard->first_chunk = afh_get_start_chunk(
 			afhi->chunks_total + conf->begin_chunk_arg,
-			&pard->afhi);
+			&pard->afhi, pard->audio_format_num);
 	if (conf->end_chunk_given) {
 		ret = -ERRNO_TO_PARA_ERROR(EINVAL);
 		if (PARA_ABS(conf->end_chunk_arg) > afhi->chunks_total)
@@ -150,6 +153,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);
 }
 
@@ -182,7 +186,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;
 
@@ -202,11 +206,16 @@ static int afh_recv_post_select(__a_unused struct sched *s, void *context)
 		}
 	}
 	if (!conf->just_in_time_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 %zu 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;
 	}
@@ -219,7 +228,10 @@ 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);
 	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) {