Mercurial > hg > svcore
diff data/fileio/DecodingWavFileReader.cpp @ 1599:ce185d4dd408 bqaudiostream
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2019 14:43:43 +0000 |
parents | f8e3dcbafb4d 70e172e6cc59 |
children | 14747f24ad04 |
line wrap: on
line diff
--- a/data/fileio/DecodingWavFileReader.cpp Wed Jan 23 10:31:40 2019 +0000 +++ b/data/fileio/DecodingWavFileReader.cpp Wed Jan 23 14:43:43 2019 +0000 @@ -35,9 +35,9 @@ m_cancelled(false), m_processed(0), m_completion(0), - m_original(0), + m_original(nullptr), m_reporter(reporter), - m_decodeThread(0) + m_decodeThread(nullptr) { SVDEBUG << "DecodingWavFileReader: local path: \"" << m_path << "\", decode mode: " << decodeMode << " (" @@ -93,7 +93,7 @@ if (m_reporter) m_reporter->setProgress(100); delete m_original; - m_original = 0; + m_original = nullptr; } else { @@ -150,7 +150,7 @@ m_reader->endSerialised(); delete m_reader->m_original; - m_reader->m_original = 0; + m_reader->m_original = nullptr; } void