aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/backends/solaris.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-11-18 08:01:50 -0800
committerChris Robinson <[email protected]>2018-11-18 08:01:50 -0800
commit8b8f01e25d31e7874acb5af7e0c3c7c801497410 (patch)
tree87656be5fa086259978724dbdda186439a93fc63 /Alc/backends/solaris.cpp
parent336b7b77999fec857093c82c050c96b8ead3cb97 (diff)
Avoid more cases of an enum variable and type name clash
Diffstat (limited to 'Alc/backends/solaris.cpp')
-rw-r--r--Alc/backends/solaris.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Alc/backends/solaris.cpp b/Alc/backends/solaris.cpp
index 008f3446..d306a0c5 100644
--- a/Alc/backends/solaris.cpp
+++ b/Alc/backends/solaris.cpp
@@ -117,7 +117,7 @@ static int ALCsolarisBackend_mixerProc(void *ptr)
SetRTPriority();
althrd_setname(MIXER_THREAD_NAME);
- frame_size = FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->AmbiOrder);
+ frame_size = FrameSizeFromDevFmt(device->FmtChans, device->FmtType, device->mAmbiOrder);
ALCsolarisBackend_lock(self);
while(!ATOMIC_LOAD(&self->killNow, almemory_order_acquire) &&
@@ -207,7 +207,7 @@ static ALCboolean ALCsolarisBackend_reset(ALCsolarisBackend *self)
if(device->FmtChans != DevFmtMono)
device->FmtChans = DevFmtStereo;
- numChannels = ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder);
+ numChannels = ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder);
info.play.channels = numChannels;
switch(device->FmtType)
@@ -241,7 +241,7 @@ static ALCboolean ALCsolarisBackend_reset(ALCsolarisBackend *self)
return ALC_FALSE;
}
- if(ChannelsFromDevFmt(device->FmtChans, device->AmbiOrder) != (ALsizei)info.play.channels)
+ if(ChannelsFromDevFmt(device->FmtChans, device->mAmbiOrder) != (ALsizei)info.play.channels)
{
ERR("Failed to set %s, got %u channels instead\n", DevFmtChannelsString(device->FmtChans), info.play.channels);
return ALC_FALSE;
@@ -264,7 +264,7 @@ static ALCboolean ALCsolarisBackend_reset(ALCsolarisBackend *self)
free(self->mix_data);
self->data_size = device->UpdateSize * FrameSizeFromDevFmt(
- device->FmtChans, device->FmtType, device->AmbiOrder
+ device->FmtChans, device->FmtType, device->mAmbiOrder
);
self->mix_data = static_cast<ALubyte*>(calloc(1, self->data_size));