diff options
| author | Chris Robinson <[email protected]> | 2018-11-18 08:01:50 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-11-18 08:01:50 -0800 |
| commit | 8b8f01e25d31e7874acb5af7e0c3c7c801497410 (patch) | |
| tree | 87656be5fa086259978724dbdda186439a93fc63 /Alc/backends/sndio.cpp | |
| parent | 336b7b77999fec857093c82c050c96b8ead3cb97 (diff) | |
Avoid more cases of an enum variable and type name clash
Diffstat (limited to 'Alc/backends/sndio.cpp')
| -rw-r--r-- | Alc/backends/sndio.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Alc/backends/sndio.cpp b/Alc/backends/sndio.cpp index 654c2975..be6cd2e3 100644 --- a/Alc/backends/sndio.cpp +++ b/Alc/backends/sndio.cpp @@ -100,7 +100,7 @@ static int SndioPlayback_mixerProc(void *ptr) SetRTPriority(); althrd_setname(MIXER_THREAD_NAME); - frameSize = FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->AmbiOrder); + frameSize = FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->mAmbiOrder); while(!ATOMIC_LOAD(&self->killNow, almemory_order_acquire) && ATOMIC_LOAD(&device->Connected, almemory_order_acquire)) @@ -244,7 +244,7 @@ static ALCboolean SndioPlayback_start(SndioPlayback *self) ALCdevice *device = STATIC_CAST(ALCbackend,self)->mDevice; self->data_size = device->UpdateSize * FrameSizeFromDevFmt( - device->FmtChans, device->FmtType, device->AmbiOrder + device->FmtChans, device->FmtType, device->mAmbiOrder ); al_free(self->mix_data); self->mix_data = al_calloc(16, self->data_size); @@ -342,7 +342,7 @@ static int SndioCapture_recordProc(void* ptr) SetRTPriority(); althrd_setname(RECORD_THREAD_NAME); - frameSize = FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->AmbiOrder); + frameSize = FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->mAmbiOrder); while(!ATOMIC_LOAD(&self->killNow, almemory_order_acquire) && ATOMIC_LOAD(&device->Connected, almemory_order_acquire)) @@ -442,7 +442,7 @@ static ALCenum SndioCapture_open(SndioCapture *self, const ALCchar *name) par.bits = par.bps * 8; par.le = SIO_LE_NATIVE; par.msb = SIO_LE_NATIVE ? 0 : 1; - par.rchan = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder); + par.rchan = ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder); par.rate = device->Frequency; par.appbufsz = maxu(device->UpdateSize*device->NumUpdates, (device->Frequency+9)/10); @@ -470,7 +470,7 @@ static ALCenum SndioCapture_open(SndioCapture *self, const ALCchar *name) (device->FmtType == DevFmtUShort && par.bits == 16 && par.sig == 0) || (device->FmtType == DevFmtInt && par.bits == 32 && par.sig != 0) || (device->FmtType == DevFmtUInt && par.bits == 32 && par.sig == 0)) || - ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder) != (ALsizei)par.rchan || + ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder) != (ALsizei)par.rchan || device->Frequency != par.rate) { ERR("Failed to set format %s %s %uhz, got %c%u %u-channel %uhz instead\n", |