diff --git a/aucat/aucat.c b/aucat/aucat.c
index 0605ff7..46ae099 100644
--- a/aucat/aucat.c
+++ b/aucat/aucat.c
@@ -426,38 +426,36 @@ slot_del(struct slot *s)
 	xfree(s);
 }
 
-static int
-play_filt_resamp(struct slot *s, void *res_in, void *out, int todo)
+static void
+play_filt_resamp(struct slot *s, void *res_in, void *out, int *icnt, int *ocnt)
 {
 	int i, offs, vol, nch;
 	void *in;
 
 	if (s->resampbuf) {
-		todo = resamp_do(&s->resamp,
-		    res_in, s->resampbuf, todo);
+		resamp_do(&s->resamp, res_in, s->resampbuf, icnt, ocnt);
 		in = s->resampbuf;
 	} else
 		in = res_in;
 
 	nch = s->cmap.nch;
 	vol = s->vol / s->join; /* XXX */
-	cmap_add(&s->cmap, in, out, vol, todo);
+	cmap_add(&s->cmap, in, out, vol, *ocnt);
 
 	offs = 0;
 	for (i = s->join - 1; i > 0; i--) {
 		offs += nch;
-		cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, todo);
+		cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, *ocnt);
 	}
 	offs = 0;
 	for (i = s->expand - 1; i > 0; i--) {
 		offs += nch;
-		cmap_add(&s->cmap, in, (adata_t *)out + offs, vol, todo);
+		cmap_add(&s->cmap, in, (adata_t *)out + offs, vol, *ocnt);
 	}
-	return todo;
 }
 
-static int
-play_filt_dec(struct slot *s, void *in, void *out, int todo)
+static void
+play_filt_dec(struct slot *s, void *in, void *out, int *icnt, int *ocnt)
 {
 	void *tmp;
 
@@ -465,20 +463,21 @@ play_filt_dec(struct slot *s, void *in, void *out, int todo)
 	if (tmp) {
 		switch (s->afile.fmt) {
 		case AFILE_FMT_PCM:
-			dec_do(&s->conv, in, tmp, todo);
+			dec_do(&s->conv, in, tmp, *icnt);
 			break;
 		case AFILE_FMT_ULAW:
-			dec_do_ulaw(&s->conv, in, tmp, todo, 0);
+			dec_do_ulaw(&s->conv, in, tmp, *icnt, 0);
 			break;
 		case AFILE_FMT_ALAW:
-			dec_do_ulaw(&s->conv, in, tmp, todo, 1);
+			dec_do_ulaw(&s->conv, in, tmp, *icnt, 1);
 			break;
 		case AFILE_FMT_FLOAT:
-			dec_do_float(&s->conv, in, tmp, todo);
+			dec_do_float(&s->conv, in, tmp, *icnt);
 			break;
 		}
-	}
-	return play_filt_resamp(s, tmp ? tmp : in, out, todo);
+	} else
+		tmp = in;
+	play_filt_resamp(s, tmp, out, icnt, ocnt);
 }
 
 /*
@@ -490,25 +489,26 @@ static int
 slot_mix_badd(struct slot *s, adata_t *odata)
 {
 	adata_t *idata;
-	int icount, todo, done;
+	int len, icnt, ocnt;
 
-	idata = (adata_t *)abuf_rgetblk(&s->buf, &icount);
-	todo = icount / s->bpf;
-	if (todo > s->round)
-		todo = s->round;
+	idata = (adata_t *)abuf_rgetblk(&s->buf, &len);
+	icnt = len / s->bpf;
+	if (icnt > s->round)
+		icnt = s->round;
 #ifdef DEBUG
-	if (todo == 0) {
+	if (icnt == 0) {
 		log_puts("slot_mix_badd: not enough data\n");
 		panic();
 	}
 #endif
-	done = play_filt_dec(s, idata, odata, todo);
-	abuf_rdiscard(&s->buf, todo * s->bpf);
-	return done;
+	ocnt = dev_round;
+	play_filt_dec(s, idata, odata, &icnt, &ocnt);
+	abuf_rdiscard(&s->buf, icnt * s->bpf);
+	return ocnt;
 }
 
-static int
-rec_filt_resamp(struct slot *s, void *in, void *res_out, int todo)
+static void
+rec_filt_resamp(struct slot *s, void *in, void *res_out, int *icnt, int *ocnt)
 {
 	int i, vol, offs, nch;
 	void *out = res_out;
@@ -517,35 +517,33 @@ rec_filt_resamp(struct slot *s, void *in, void *res_out, int todo)
 
 	nch = s->cmap.nch;
 	vol = ADATA_UNIT / s->join;
-	cmap_copy(&s->cmap, in, out, vol, todo);
+	cmap_copy(&s->cmap, in, out, vol, *icnt);
 
 	offs = 0;
 	for (i = s->join - 1; i > 0; i--) {
 		offs += nch;
-		cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, todo);
+		cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, *icnt);
 	}
 	offs = 0;
 	for (i = s->expand - 1; i > 0; i--) {
 		offs += nch;
-		cmap_copy(&s->cmap, in, (adata_t *)out + offs, vol, todo);
+		cmap_copy(&s->cmap, in, (adata_t *)out + offs, vol, *icnt);
 	}
-	if (s->resampbuf) {
-		todo = resamp_do(&s->resamp,
-		    s->resampbuf, res_out, todo);
-	}
-	return todo;
+	if (s->resampbuf)
+		resamp_do(&s->resamp, s->resampbuf, res_out, icnt, ocnt);
+	else
+		*ocnt = *icnt;
 }
 
-static int
-rec_filt_enc(struct slot *s, void *in, void *out, int todo)
+static void
+rec_filt_enc(struct slot *s, void *in, void *out, int *icnt, int *ocnt)
 {
 	void *tmp;
 
 	tmp = s->convbuf;
-	todo = rec_filt_resamp(s, in, tmp ? tmp : out, todo);
+	rec_filt_resamp(s, in, tmp ? tmp : out, icnt, ocnt);
 	if (tmp)
-		enc_do(&s->conv, tmp, out, todo);
-	return todo;
+		enc_do(&s->conv, tmp, out, *ocnt);
 }
 
 /*
@@ -556,17 +554,19 @@ static void
 slot_sub_bcopy(struct slot *s, adata_t *idata, int todo)
 {
 	adata_t *odata;
-	int ocount;
+	int len, icnt, ocnt;
 
-	odata = (adata_t *)abuf_wgetblk(&s->buf, &ocount);
+	odata = (adata_t *)abuf_wgetblk(&s->buf, &len);
 #ifdef DEBUG
-	if (ocount < s->round * s->bpf) {
+	if (len < s->round * s->bpf) {
 		log_puts("slot_sub_bcopy: not enough space\n");
 		panic();
 	}
 #endif
-	ocount = rec_filt_enc(s, idata, odata, todo);
-	abuf_wcommit(&s->buf, ocount * s->bpf);
+	icnt = todo;
+	ocnt = len / s->bpf;
+	rec_filt_enc(s, idata, odata, &icnt, &ocnt);
+	abuf_wcommit(&s->buf, ocnt * s->bpf);
 }
 
 static int
diff --git a/aucat/dsp.c b/aucat/dsp.c
index f118d64..840abe4 100644
--- a/aucat/dsp.c
+++ b/aucat/dsp.c
@@ -270,8 +270,8 @@ aparams_native(struct aparams *par)
 /*
  * resample the given number of frames
  */
-int
-resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
+void
+resamp_do(struct resamp *p, adata_t *in, adata_t *out, int *icnt, int *ocnt)
 {
 	unsigned int nch;
 	adata_t *idata;
@@ -298,8 +298,8 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
 	ctxbuf = p->ctx;
 	ctx_start = p->ctx_start;
 	nch = p->nch;
-	ifr = todo;
-	ofr = oblksz;
+	ifr = *icnt;
+	ofr = *ocnt;
 
 	/*
 	 * Start conversion.
@@ -307,9 +307,11 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
 #ifdef DEBUG
 	if (log_level >= 4) {
 		log_puts("resamp: copying ");
-		log_puti(todo);
+		log_puti(ifr);
 		log_puts(" frames, diff = ");
 		log_putu(diff);
+		log_puts(", max = ");
+		log_putu(ofr);
 		log_puts("\n");
 	}
 #endif
@@ -359,7 +361,8 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
 	}
 	p->diff = diff;
 	p->ctx_start = ctx_start;
-	return oblksz - ofr;
+	*icnt -= ifr;
+	*ocnt -= ofr;
 }
 
 /*
diff --git a/aucat/dsp.h b/aucat/dsp.h
index f790466..7582cd3 100644
--- a/aucat/dsp.h
+++ b/aucat/dsp.h
@@ -147,7 +147,7 @@ int aparams_strtoenc(struct aparams *, char *);
 int aparams_enctostr(struct aparams *, char *);
 int aparams_native(struct aparams *);
 
-int resamp_do(struct resamp *, adata_t *, adata_t *, int);
+void resamp_do(struct resamp *, adata_t *, adata_t *, int *, int *);
 void resamp_init(struct resamp *, unsigned int, unsigned int, int);
 void enc_do(struct conv *, unsigned char *, unsigned char *, int);
 void enc_sil_do(struct conv *, unsigned char *, int);