diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-10 09:24:09 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-10 09:24:09 +1300 |
| commit | 633dc75e857d649ffab7c4398e92536bccc9e1de (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/AudioCommon/DSoundStream.cpp | |
| parent | f4012638672472afdbd9956229f273a18a77fd77 (diff) | |
| parent | d802d392811be44d34ae9cd23f616db93e54c50f (diff) | |
Merge pull request #142 from Tilka/clang-modernize
Run clang-modernize and manually fix the result
Diffstat (limited to 'Source/Core/AudioCommon/DSoundStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/DSoundStream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/AudioCommon/DSoundStream.cpp b/Source/Core/AudioCommon/DSoundStream.cpp index 76eb404665..742019a1b4 100644 --- a/Source/Core/AudioCommon/DSoundStream.cpp +++ b/Source/Core/AudioCommon/DSoundStream.cpp @@ -32,7 +32,7 @@ bool DSound::CreateBuffer() dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&pcmwf; dsbdesc.guid3DAlgorithm = DS3DALG_DEFAULT; - HRESULT res = ds->CreateSoundBuffer(&dsbdesc, &dsBuffer, NULL); + HRESULT res = ds->CreateSoundBuffer(&dsbdesc, &dsBuffer, nullptr); if (SUCCEEDED(res)) { dsBuffer->SetCurrentPosition(0); @@ -43,7 +43,7 @@ bool DSound::CreateBuffer() { // Failed. PanicAlertT("Sound buffer creation failed: %08x", res); - dsBuffer = NULL; + dsBuffer = nullptr; return false; } } @@ -130,7 +130,7 @@ void DSound::SetVolume(int volume) // This is in "dBA attenuation" from 0 to -10000, logarithmic m_volume = (int)floor(log10((float)volume) * 5000.0f) - 10000; - if (dsBuffer != NULL) + if (dsBuffer != nullptr) dsBuffer->SetVolume(m_volume); } @@ -143,7 +143,7 @@ void DSound::Clear(bool mute) { m_muted = mute; - if (dsBuffer != NULL) + if (dsBuffer != nullptr) { if (m_muted) { |