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/dsound.cpp | |
parent | 336b7b77999fec857093c82c050c96b8ead3cb97 (diff) |
Avoid more cases of an enum variable and type name clash
Diffstat (limited to 'Alc/backends/dsound.cpp')
-rw-r--r-- | Alc/backends/dsound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Alc/backends/dsound.cpp b/Alc/backends/dsound.cpp index a52bb17c..b642dfea 100644 --- a/Alc/backends/dsound.cpp +++ b/Alc/backends/dsound.cpp @@ -265,7 +265,7 @@ FORCE_ALIGN int ALCdsoundPlayback_mixerProc(ALCdsoundPlayback *self) return 1; } - ALsizei FrameSize{FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->AmbiOrder)}; + ALsizei FrameSize{FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->mAmbiOrder)}; DWORD FragSize{device->UpdateSize * FrameSize}; bool Playing{false}; @@ -523,7 +523,7 @@ ALCboolean ALCdsoundPlayback_reset(ALCdsoundPlayback *self) retry_open: hr = S_OK; OutputType.Format.wFormatTag = WAVE_FORMAT_PCM; - OutputType.Format.nChannels = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder); + OutputType.Format.nChannels = ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder); OutputType.Format.wBitsPerSample = BytesFromDevFmt(device->FmtType) * 8; OutputType.Format.nBlockAlign = OutputType.Format.nChannels*OutputType.Format.wBitsPerSample/8; OutputType.Format.nSamplesPerSec = device->Frequency; @@ -807,7 +807,7 @@ ALCenum ALCdsoundCapture_open(ALCdsoundCapture *self, const ALCchar *deviceName) } InputType.Format.wFormatTag = WAVE_FORMAT_PCM; - InputType.Format.nChannels = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder); + InputType.Format.nChannels = ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder); InputType.Format.wBitsPerSample = BytesFromDevFmt(device->FmtType) * 8; InputType.Format.nBlockAlign = InputType.Format.nChannels*InputType.Format.wBitsPerSample/8; InputType.Format.nSamplesPerSec = device->Frequency; @@ -908,7 +908,7 @@ ALCuint ALCdsoundCapture_availableSamples(ALCdsoundCapture *self) if(!ATOMIC_LOAD(&device->Connected, almemory_order_acquire)) return ll_ringbuffer_read_space(self->Ring); - ALsizei FrameSize{FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->AmbiOrder)}; + ALsizei FrameSize{FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->mAmbiOrder)}; DWORD BufferBytes{self->BufferBytes}; DWORD LastCursor{self->Cursor}; |