diff options
Diffstat (limited to 'usr.bin/aucat/wav.h')
| -rw-r--r-- | usr.bin/aucat/wav.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/usr.bin/aucat/wav.h b/usr.bin/aucat/wav.h index 6d721e1ac65..2e9ca346aeb 100644 --- a/usr.bin/aucat/wav.h +++ b/usr.bin/aucat/wav.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wav.h,v 1.12 2011/10/12 07:20:04 ratchov Exp $ */ +/* $OpenBSD: wav.h,v 1.13 2012/04/11 06:05:43 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -28,8 +28,8 @@ struct wav { #define HDR_AUTO 0 /* guess by looking at the file name */ #define HDR_RAW 1 /* no headers, ie openbsd native ;-) */ #define HDR_WAV 2 /* microsoft riff wave */ - unsigned hdr; /* HDR_RAW or HDR_WAV */ - unsigned xrun; /* xrun policy */ + unsigned int hdr; /* HDR_RAW or HDR_WAV */ + unsigned int xrun; /* xrun policy */ struct aparams hpar; /* parameters to write on the header */ off_t rbytes; /* bytes to read, -1 if no limit */ off_t wbytes; /* bytes to write, -1 if no limit */ @@ -40,16 +40,16 @@ struct wav { int slot; /* mixer ctl slot number */ int mmc; /* use MMC control */ int join; /* join/expand channels */ - unsigned vol; /* current volume */ - unsigned maxweight; /* dynamic range when vol == 127 */ + unsigned int vol; /* current volume */ + unsigned int maxweight; /* dynamic range when vol == 127 */ #define WAV_CFG 0 /* parameters read from headers */ #define WAV_INIT 1 /* not trying to do anything */ #define WAV_START 2 /* buffer allocated */ #define WAV_READY 3 /* buffer filled enough */ #define WAV_RUN 4 /* buffer attached to device */ #define WAV_MIDI 5 /* midi "syx" file */ - unsigned pstate; /* one of above */ - unsigned mode; /* bitmap of MODE_* */ + unsigned int pstate; /* one of above */ + unsigned int mode; /* bitmap of MODE_* */ struct dev *dev; /* device playing or recording */ }; @@ -57,15 +57,17 @@ extern struct fileops wav_ops; struct wav *wav_list; struct wav *wav_new_in(struct fileops *, struct dev *, - unsigned, char *, unsigned, struct aparams *, unsigned, unsigned, int, int); + unsigned int, char *, unsigned int, struct aparams *, + unsigned int, unsigned int, int, int); struct wav *wav_new_out(struct fileops *, struct dev *, - unsigned, char *, unsigned, struct aparams *, unsigned, int, int); -unsigned wav_read(struct file *, unsigned char *, unsigned); -unsigned wav_write(struct file *, unsigned char *, unsigned); + unsigned int, char *, unsigned int, struct aparams *, + unsigned int, int, int); +unsigned int wav_read(struct file *, unsigned char *, unsigned int); +unsigned int wav_write(struct file *, unsigned char *, unsigned int); void wav_close(struct file *); int wav_readhdr(int, struct aparams *, off_t *, off_t *, short **); int wav_writehdr(int, struct aparams *, off_t *, off_t); -void wav_conv(unsigned char *, unsigned, short *); +void wav_conv(unsigned char *, unsigned int, short *); int wav_init(struct wav *); extern short wav_ulawmap[256]; |