diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2018-11-18 08:01:50 -0800 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2018-11-18 08:01:50 -0800 |
| commit | 8b8f01e25d31e7874acb5af7e0c3c7c801497410 (patch) | |
| tree | 87656be5fa086259978724dbdda186439a93fc63 /Alc/backends/wasapi.cpp | |
| parent | 336b7b77999fec857093c82c050c96b8ead3cb97 (diff) | |
Avoid more cases of an enum variable and type name clash
Diffstat (limited to 'Alc/backends/wasapi.cpp')
| -rw-r--r-- | Alc/backends/wasapi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Alc/backends/wasapi.cpp b/Alc/backends/wasapi.cpp index 7f52bafe..76d5f1ef 100644 --- a/Alc/backends/wasapi.cpp +++ b/Alc/backends/wasapi.cpp @@ -1306,7 +1306,7 @@ FORCE_ALIGN int ALCwasapiCapture_recordProc(ALCwasapiCapture *self) else { ALuint framesize = FrameSizeFromDevFmt(device->FmtChans, device->FmtType, - device->AmbiOrder); + device->mAmbiOrder); size_t len1 = minz(data[0].len, numsamples); size_t len2 = minz(data[1].len, numsamples-len1); @@ -1674,7 +1674,7 @@ HRESULT ALCwasapiCapture::resetProxy() if(device->Frequency != OutputType.Format.nSamplesPerSec || device->FmtType != srcType) { mSampleConv = CreateSampleConverter( - srcType, device->FmtType, ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder), + srcType, device->FmtType, ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder), OutputType.Format.nSamplesPerSec, device->Frequency ); if(!mSampleConv) @@ -1708,7 +1708,7 @@ HRESULT ALCwasapiCapture::resetProxy() buffer_len = maxu(device->UpdateSize*device->NumUpdates, buffer_len); ll_ringbuffer_free(mRing); mRing = ll_ringbuffer_create(buffer_len, - FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->AmbiOrder), + FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->mAmbiOrder), false ); if(!mRing) |