comparison data/fileio/DecodingWavFileReader.cpp @ 1582:70e172e6cc59 fix-static-analysis

Use nullptr throughout
author Chris Cannam
date Mon, 26 Nov 2018 14:33:41 +0000
parents 54af1e21705c
children ce185d4dd408
comparison
equal deleted inserted replaced
1581:ad5f892c0c4d 1582:70e172e6cc59
33 m_source(source), 33 m_source(source),
34 m_path(source.getLocalFilename()), 34 m_path(source.getLocalFilename()),
35 m_cancelled(false), 35 m_cancelled(false),
36 m_processed(0), 36 m_processed(0),
37 m_completion(0), 37 m_completion(0),
38 m_original(0), 38 m_original(nullptr),
39 m_reporter(reporter), 39 m_reporter(reporter),
40 m_decodeThread(0) 40 m_decodeThread(nullptr)
41 { 41 {
42 SVDEBUG << "DecodingWavFileReader: local path: \"" << m_path 42 SVDEBUG << "DecodingWavFileReader: local path: \"" << m_path
43 << "\", decode mode: " << decodeMode << " (" 43 << "\", decode mode: " << decodeMode << " ("
44 << (decodeMode == DecodeAtOnce ? "DecodeAtOnce" : "DecodeThreaded") 44 << (decodeMode == DecodeAtOnce ? "DecodeAtOnce" : "DecodeThreaded")
45 << ")" << endl; 45 << ")" << endl;
88 endSerialised(); 88 endSerialised();
89 89
90 if (m_reporter) m_reporter->setProgress(100); 90 if (m_reporter) m_reporter->setProgress(100);
91 91
92 delete m_original; 92 delete m_original;
93 m_original = 0; 93 m_original = nullptr;
94 94
95 } else { 95 } else {
96 96
97 if (m_reporter) m_reporter->setProgress(100); 97 if (m_reporter) m_reporter->setProgress(100);
98 98
145 m_reader->m_completion = 100; 145 m_reader->m_completion = 100;
146 146
147 m_reader->endSerialised(); 147 m_reader->endSerialised();
148 148
149 delete m_reader->m_original; 149 delete m_reader->m_original;
150 m_reader->m_original = 0; 150 m_reader->m_original = nullptr;
151 } 151 }
152 152
153 void 153 void
154 DecodingWavFileReader::addBlock(const floatvec_t &frames) 154 DecodingWavFileReader::addBlock(const floatvec_t &frames)
155 { 155 {