diff options
| author | Ariff Abdullah <ariff@FreeBSD.org> | 2007-06-16 20:36:39 +0000 |
|---|---|---|
| committer | Ariff Abdullah <ariff@FreeBSD.org> | 2007-06-16 20:36:39 +0000 |
| commit | c17bfa7714b3a4e6f17be4d6fe8692042376366b (patch) | |
| tree | e4383aeca37ee31f026f0e77cf26a82a1050e67c /sys/dev/sound | |
| parent | 48c513e07f7a8590bce7d091aea0300338e19cef (diff) | |
Notes
Diffstat (limited to 'sys/dev/sound')
| -rw-r--r-- | sys/dev/sound/pcm/feeder_volume.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index b7392ddf5ce5f..754a10e6c683f 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -36,14 +36,14 @@ SND_DECLARE_FILE("$FreeBSD$"); #define FVOL_CLAMP(val) (((val) << FVOL_RESOLUTION) / FVOL_OSS_SCALE) #define FVOL_LEFT(val) FVOL_CLAMP((val) & 0x7f) #define FVOL_RIGHT(val) FVOL_LEFT((val) >> 8) -#define FVOL_MAX (1U << FVOL_RESOLUTION) +#define FVOL_MAX (1 << FVOL_RESOLUTION) #define FVOL_CALC(sval, vval) (((sval) * (vval)) >> FVOL_RESOLUTION) -typedef uint32_t (*feed_volume_filter)(uint8_t *, uint32_t *, uint32_t); +typedef uint32_t (*feed_volume_filter)(uint8_t *, int *, uint32_t); #define FEEDER_VOLUME_FILTER(FMTBIT, VOL_INTCAST, SIGN, SIGNS, ENDIAN, ENDIANS) \ static uint32_t \ -feed_volume_filter_##SIGNS##FMTBIT##ENDIANS(uint8_t *b, uint32_t *vol, \ +feed_volume_filter_##SIGNS##FMTBIT##ENDIANS(uint8_t *b, int *vol, \ uint32_t count) \ { \ int32_t j; \ @@ -137,7 +137,7 @@ feed_volume(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, uint32_t count, void *source) { struct feed_volume_info *info; - uint32_t vol[2]; + int vol[2]; int k, smpsz; vol[0] = FVOL_LEFT(c->volume); |