=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/aucat/Attic/wav.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- src/usr.bin/aucat/Attic/wav.c 2010/09/18 08:36:00 1.22 +++ src/usr.bin/aucat/Attic/wav.c 2010/11/05 15:23:18 1.23 @@ -203,14 +203,14 @@ { 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 @@ 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 @@ f->rbytes -= n; if (f->map) { wav_conv(data, n, f->map); - n *= sizeof(short); + n *= sizeof(adata_t); } return n; }