diff options
author | Chris Robinson <[email protected]> | 2014-06-20 16:43:14 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2014-06-20 16:43:14 -0700 |
commit | be903d67b87a38616d4b7a901c3bf93441b1cb91 (patch) | |
tree | 6db2e9234f790b541637d07007ee17b81b59d094 /Alc/hrtf.c | |
parent | fb25a70f9533a8ada104f1d84b1ed9d1eb69ccc0 (diff) |
Don't pass the device to HRTF methods
Diffstat (limited to 'Alc/hrtf.c')
-rw-r--r-- | Alc/hrtf.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -745,40 +745,39 @@ static struct Hrtf *LoadHrtf(ALuint deviceRate) return NULL; } -const struct Hrtf *GetHrtf(ALCdevice *device) +const struct Hrtf *GetHrtf(enum DevFmtChannels chans, ALCuint srate) { - if(device->FmtChans == DevFmtStereo) + if(chans == DevFmtStereo) { struct Hrtf *Hrtf = LoadedHrtfs; while(Hrtf != NULL) { - if(device->Frequency == Hrtf->sampleRate) + if(srate == Hrtf->sampleRate) return Hrtf; Hrtf = Hrtf->next; } - Hrtf = LoadHrtf(device->Frequency); + Hrtf = LoadHrtf(srate); if(Hrtf != NULL) return Hrtf; } - ERR("Incompatible format: %s %uhz\n", - DevFmtChannelsString(device->FmtChans), device->Frequency); + ERR("Incompatible format: %s %uhz\n", DevFmtChannelsString(chans), srate); return NULL; } -ALCboolean FindHrtfFormat(const ALCdevice *device, enum DevFmtChannels *chans, ALCuint *srate) +ALCboolean FindHrtfFormat(enum DevFmtChannels *chans, ALCuint *srate) { const struct Hrtf *hrtf = LoadedHrtfs; while(hrtf != NULL) { - if(device->Frequency == hrtf->sampleRate) + if(*srate == hrtf->sampleRate) break; hrtf = hrtf->next; } if(hrtf == NULL) { - hrtf = LoadHrtf(device->Frequency); + hrtf = LoadHrtf(*srate); if(hrtf == NULL) return ALC_FALSE; } |