d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFP4:

Browse Source 
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
This commit is contained in:
netchild 2006-10-28 09:51:10 +00:00
parent 4061ab1e3c
commit 9dc71b9b72
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/sound/pcm/dsp.c
View File

@ -1809,8 +1809,8 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai)
ai->max_channels = maxch;
ai->nrates = chn_getrates(ch, &rates);
if (ai->nrates > MAX_SAMPLE_RATES)
ai->nrates = MAX_SAMPLE_RATES;
if (ai->nrates > OSS_MAX_SAMPLE_RATES)
ai->nrates = OSS_MAX_SAMPLE_RATES;
for (i = 0; i < ai->nrates; i++)
ai->rates[i] = rates[i];

4
sys/sys/soundcard.h
View File

@ -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 */