diff options
| author | kcat <[email protected]> | 2019-01-07 04:36:50 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-07 04:36:50 -0800 |
| commit | 2a7f27ca58f9897be06fe815a46ea76a01734a0b (patch) | |
| tree | ca9aa7e99770f175209e50f1f88ed3e9b656c89b /Alc | |
| parent | 4d047e2bc166e8155dd9714e53efda09def2b6ef (diff) | |
| parent | 0537414bafe80e5e32486672ddce82581fb5e1c3 (diff) | |
Merge pull request #260 from ShFil119/impr/nullptr
Use nullptr in cpp files
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/alu.cpp | 4 | ||||
| -rw-r--r-- | Alc/mixvoice.cpp | 4 |
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; |