summaryrefslogtreecommitdiffstats
path: root/sys/sys/soundcard.h
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2006-10-28 09:51:10 +0000
committernetchild <netchild@FreeBSD.org>2006-10-28 09:51:10 +0000
commit9dc71b9b7238a0d1e96bad1c0436b37b50db9802 (patch)
treee60a9abb0d3822b76a54f47f2cbc943bceeb2eea /sys/sys/soundcard.h
parent4061ab1e3cb7f2de66f71498d4ac8f3685768904 (diff)
downloadFreeBSD-src-9dc71b9b7238a0d1e96bad1c0436b37b50db9802.zip
FreeBSD-src-9dc71b9b7238a0d1e96bad1c0436b37b50db9802.tar.gz
MFP4:
Rename MAX_SAMPLE_RATES macro to OSS_MAX_SAMPLE_RATES. The old macro clashed with those used in other applications and libaries (ex: RtAudio). 4Front responded by updating their spec, so we will follow suit. Submitted by: ryanb Noticed by: pointyhat/kris
Diffstat (limited to 'sys/sys/soundcard.h')
-rw-r--r--sys/sys/soundcard.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index a43952f..0342da3 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -1769,9 +1769,9 @@ typedef struct oss_audioinfo
int binding; /* DSP_BIND_FRONT, etc. 0 means undefined */
int rate_source;
char handle[32];
- #define MAX_SAMPLE_RATES 20 /* Cannot be changed */
+ #define OSS_MAX_SAMPLE_RATES 20 /* Cannot be changed */
unsigned int nrates;
- unsigned int rates[MAX_SAMPLE_RATES]; /* Please read the manual before using these */
+ unsigned int rates[OSS_MAX_SAMPLE_RATES]; /* Please read the manual before using these */
oss_longname_t song_name; /* Song name (if given) */
oss_label_t label; /* Device label (if given) */
int latency; /* In usecs, -1=unknown */
OpenPOWER on IntegriCloud