aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/alc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Alc/alc.cpp')
-rw-r--r--Alc/alc.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index 640e60b7..c7caaf19 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -1523,13 +1523,13 @@ void SetDefaultWFXChannelOrder(ALCdevice *device)
break;
case DevFmtAmbi3D:
device->RealOut.ChannelName[0] = Aux0;
- if(device->AmbiOrder > 0)
+ if(device->mAmbiOrder > 0)
{
device->RealOut.ChannelName[1] = Aux1;
device->RealOut.ChannelName[2] = Aux2;
device->RealOut.ChannelName[3] = Aux3;
}
- if(device->AmbiOrder > 1)
+ if(device->mAmbiOrder > 1)
{
device->RealOut.ChannelName[4] = Aux4;
device->RealOut.ChannelName[5] = Aux5;
@@ -1537,7 +1537,7 @@ void SetDefaultWFXChannelOrder(ALCdevice *device)
device->RealOut.ChannelName[7] = Aux7;
device->RealOut.ChannelName[8] = Aux8;
}
- if(device->AmbiOrder > 2)
+ if(device->mAmbiOrder > 2)
{
device->RealOut.ChannelName[9] = Aux9;
device->RealOut.ChannelName[10] = Aux10;
@@ -1847,9 +1847,9 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
device->FmtType = static_cast<enum DevFmtType>(stype);
if(schans == ALC_BFORMAT3D_SOFT)
{
- device->AmbiOrder = aorder;
- device->AmbiLayout = static_cast<enum AmbiLayout>(alayout);
- device->AmbiScale = static_cast<enum AmbiNorm>(ascale);
+ device->mAmbiOrder = aorder;
+ device->mAmbiLayout = static_cast<enum AmbiLayout>(alayout);
+ device->mAmbiScale = static_cast<enum AmbiNorm>(ascale);
}
if(numMono > INT_MAX-numStereo)
@@ -3227,13 +3227,13 @@ static ALCsizei GetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALC
if(device->FmtChans == DevFmtAmbi3D)
{
values[i++] = ALC_AMBISONIC_LAYOUT_SOFT;
- values[i++] = device->AmbiLayout;
+ values[i++] = device->mAmbiLayout;
values[i++] = ALC_AMBISONIC_SCALING_SOFT;
- values[i++] = device->AmbiScale;
+ values[i++] = device->mAmbiScale;
values[i++] = ALC_AMBISONIC_ORDER_SOFT;
- values[i++] = device->AmbiOrder;
+ values[i++] = device->mAmbiOrder;
}
values[i++] = ALC_FORMAT_CHANNELS_SOFT;
@@ -3332,7 +3332,7 @@ static ALCsizei GetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALC
alcSetError(device, ALC_INVALID_DEVICE);
return 0;
}
- values[0] = device->AmbiLayout;
+ values[0] = device->mAmbiLayout;
return 1;
case ALC_AMBISONIC_SCALING_SOFT:
@@ -3341,7 +3341,7 @@ static ALCsizei GetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALC
alcSetError(device, ALC_INVALID_DEVICE);
return 0;
}
- values[0] = device->AmbiScale;
+ values[0] = device->mAmbiScale;
return 1;
case ALC_AMBISONIC_ORDER_SOFT:
@@ -3350,7 +3350,7 @@ static ALCsizei GetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALC
alcSetError(device, ALC_INVALID_DEVICE);
return 0;
}
- values[0] = device->AmbiOrder;
+ values[0] = device->mAmbiOrder;
return 1;
case ALC_MONO_SOURCES:
@@ -3464,13 +3464,13 @@ ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname,
if(device->FmtChans == DevFmtAmbi3D)
{
values[i++] = ALC_AMBISONIC_LAYOUT_SOFT;
- values[i++] = device->AmbiLayout;
+ values[i++] = device->mAmbiLayout;
values[i++] = ALC_AMBISONIC_SCALING_SOFT;
- values[i++] = device->AmbiScale;
+ values[i++] = device->mAmbiScale;
values[i++] = ALC_AMBISONIC_ORDER_SOFT;
- values[i++] = device->AmbiOrder;
+ values[i++] = device->mAmbiOrder;
}
values[i++] = ALC_FORMAT_CHANNELS_SOFT;
@@ -3908,8 +3908,8 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
device->FmtType = DevFmtTypeDefault;
device->Frequency = DEFAULT_OUTPUT_RATE;
device->IsHeadphones = AL_FALSE;
- device->AmbiLayout = AmbiLayout_Default;
- device->AmbiScale = AmbiNorm_Default;
+ device->mAmbiLayout = AmbiLayout_Default;
+ device->mAmbiScale = AmbiNorm_Default;
device->LimiterState = ALC_TRUE;
device->NumUpdates = 3;
device->UpdateSize = 1024;
@@ -3947,7 +3947,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
else
{
device->FmtChans = iter->chans;
- device->AmbiOrder = iter->order;
+ device->mAmbiOrder = iter->order;
device->Flags |= DEVICE_CHANNELS_REQUEST;
}
}
@@ -4031,18 +4031,18 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
{
if(strcasecmp(fmt, "fuma") == 0)
{
- device->AmbiLayout = AmbiLayout_FuMa;
- device->AmbiScale = AmbiNorm_FuMa;
+ device->mAmbiLayout = AmbiLayout_FuMa;
+ device->mAmbiScale = AmbiNorm_FuMa;
}
else if(strcasecmp(fmt, "acn+sn3d") == 0)
{
- device->AmbiLayout = AmbiLayout_ACN;
- device->AmbiScale = AmbiNorm_SN3D;
+ device->mAmbiLayout = AmbiLayout_ACN;
+ device->mAmbiScale = AmbiNorm_SN3D;
}
else if(strcasecmp(fmt, "acn+n3d") == 0)
{
- device->AmbiLayout = AmbiLayout_ACN;
- device->AmbiScale = AmbiNorm_N3D;
+ device->mAmbiLayout = AmbiLayout_ACN;
+ device->mAmbiScale = AmbiNorm_N3D;
}
else
ERR("Unsupported ambi-format: %s\n", fmt);
@@ -4145,9 +4145,9 @@ ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName,
}
device->Flags |= DEVICE_CHANNELS_REQUEST | DEVICE_SAMPLE_TYPE_REQUEST;
device->IsHeadphones = AL_FALSE;
- device->AmbiOrder = 0;
- device->AmbiLayout = AmbiLayout_Default;
- device->AmbiScale = AmbiNorm_Default;
+ device->mAmbiOrder = 0;
+ device->mAmbiLayout = AmbiLayout_Default;
+ device->mAmbiScale = AmbiNorm_Default;
device->UpdateSize = samples;
device->NumUpdates = 1;
@@ -4316,8 +4316,8 @@ ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceN
device->FmtChans = DevFmtChannelsDefault;
device->FmtType = DevFmtTypeDefault;
device->IsHeadphones = AL_FALSE;
- device->AmbiLayout = AmbiLayout_Default;
- device->AmbiScale = AmbiNorm_Default;
+ device->mAmbiLayout = AmbiLayout_Default;
+ device->mAmbiScale = AmbiNorm_Default;
ConfigValueUInt(nullptr, nullptr, "sources", &device->SourcesMax);
if(device->SourcesMax == 0) device->SourcesMax = 256;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 09:09:11 +0000