aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorFilip Gawin <[email protected]>2019-01-07 12:37:13 +0100
committerFilip Gawin <[email protected]>2019-01-07 12:37:13 +0100
commit0537414bafe80e5e32486672ddce82581fb5e1c3 (patch)
treec24a0957f54fb11b85bc2ba76e301cbfa2c3ebf3 /Alc
parentfababe76c4f0482fb2527ef931b84681dd133ca6 (diff)
Use nullptr in cpp files
Diffstat (limited to 'Alc')
-rw-r--r--Alc/alu.cpp4
-rw-r--r--Alc/mixvoice.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/Alc/alu.cpp b/Alc/alu.cpp
index 7d2709ea..77505a0c 100644
--- a/Alc/alu.cpp
+++ b/Alc/alu.cpp
@@ -1012,8 +1012,8 @@ void CalcNonAttnSourceParams(ALvoice *voice, const ALvoicePropsBase *props, cons
SendSlots[i] = ALContext->DefaultSlot.get();
if(!SendSlots[i] || SendSlots[i]->Params.EffectType == AL_EFFECT_NULL)
{
- SendSlots[i] = NULL;
- voice->Send[i].Buffer = NULL;
+ SendSlots[i] = nullptr;
+ voice->Send[i].Buffer = nullptr;
voice->Send[i].Channels = 0;
}
else
diff --git a/Alc/mixvoice.cpp b/Alc/mixvoice.cpp
index 53721201..eb219bad 100644
--- a/Alc/mixvoice.cpp
+++ b/Alc/mixvoice.cpp
@@ -156,7 +156,7 @@ void aluInitMixer(void)
{
const char *str;
- if(ConfigValueStr(NULL, NULL, "resampler", &str))
+ if(ConfigValueStr(nullptr, nullptr, "resampler", &str))
{
if(strcasecmp(str, "point") == 0 || strcasecmp(str, "none") == 0)
ResamplerDefault = PointResampler;
@@ -698,7 +698,7 @@ ALboolean MixSource(ALvoice *voice, const ALuint SourceID, ALCcontext *Context,
if(DataPosInt >= BufferListItem->max_samples)
{
isplaying = false;
- BufferListItem = NULL;
+ BufferListItem = nullptr;
DataPosInt = 0;
DataPosFrac = 0;
break;