Convert ulaw/alaw to native format (ie using ADATA_XXX defines) rather

than s16 (using hardcoded constants). Currently s16 is the native format,
so no behavior change.

1 files changed, 5 insertions, 5 deletions

diff --git a/usr.bin/aucat/wav.c b/usr.bin/aucat/wav.c
index d901ad3f927..4ab6ba9a428 100644
--- a/usr.bin/aucat/wav.c
+++ b/usr.bin/aucat/wav.c
@@ -203,14 +203,14 @@ wav_conv(unsigned char *data, unsigned count, short *map)
 {
 	unsigned i;
 	unsigned char *iptr;
-	short *optr;
+	adata_t *optr;
 
 	iptr = data + count;
-	optr = (short *)data + count;
+	optr = (adata_t *)data + count;
 	for (i = count; i > 0; i--) {
 		--optr;
 		--iptr;
-		*optr = map[*iptr];
+		*optr = (adata_t)(map[*iptr]) << (ADATA_BITS - 16);
 	}
 }
 
@@ -224,7 +224,7 @@ wav_read(struct file *file, unsigned char *data, unsigned count)
 	unsigned n;
 
 	if (f->map)
-		count /= sizeof(short);
+		count /= sizeof(adata_t);
 	if (f->rbytes >= 0 && count > f->rbytes) {
 		count = f->rbytes; /* file->rbytes fits in count */
 		if (count == 0) {
@@ -246,7 +246,7 @@ wav_read(struct file *file, unsigned char *data, unsigned count)
 		f->rbytes -= n;
 	if (f->map) {
 		wav_conv(data, n, f->map);
-		n *= sizeof(short);
+		n *= sizeof(adata_t);
 	}
 	return n;
 }