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/winmm.cpp | |
parent | 336b7b77999fec857093c82c050c96b8ead3cb97 (diff) |
Avoid more cases of an enum variable and type name clash
Diffstat (limited to 'Alc/backends/winmm.cpp')
-rw-r--r-- | Alc/backends/winmm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Alc/backends/winmm.cpp b/Alc/backends/winmm.cpp index 1d0a8ecc..8b97daab 100644 --- a/Alc/backends/winmm.cpp +++ b/Alc/backends/winmm.cpp @@ -341,7 +341,7 @@ ALCboolean ALCwinmmPlayback_reset(ALCwinmmPlayback *self) SetDefaultWFXChannelOrder(device); ALuint BufferSize{device->UpdateSize * - FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->AmbiOrder)}; + FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->mAmbiOrder)}; al_free(self->WaveBuffer[0].lpData); self->WaveBuffer[0] = WAVEHDR{}; @@ -564,7 +564,7 @@ ALCenum ALCwinmmCapture_open(ALCwinmmCapture *self, const ALCchar *deviceName) memset(&self->Format, 0, sizeof(WAVEFORMATEX)); self->Format.wFormatTag = (device->FmtType == DevFmtFloat) ? WAVE_FORMAT_IEEE_FLOAT : WAVE_FORMAT_PCM; - self->Format.nChannels = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder); + self->Format.nChannels = ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder); self->Format.wBitsPerSample = BytesFromDevFmt(device->FmtType) * 8; self->Format.nBlockAlign = self->Format.wBitsPerSample * self->Format.nChannels / 8; |