comparison data/fileio/DecodingWavFileReader.cpp @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch

     m_source(source),
     m_path(source.getLocalFilename()),
     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 << " ("
             << (decodeMode == DecodeAtOnce ? "DecodeAtOnce" : "DecodeThreaded")
             << ")" << endl;

         endSerialised();
 
         if (m_reporter) m_reporter->setProgress(100);
 
         delete m_original;
-        m_original = 0;
+        m_original = nullptr;
 
     } else {
 
         if (m_reporter) m_reporter->setProgress(100);
 

     m_reader->m_completion = 100;
 
     m_reader->endSerialised();
 
     delete m_reader->m_original;
-    m_reader->m_original = 0;
+    m_reader->m_original = nullptr;
 } 
 
 void
 DecodingWavFileReader::addBlock(const floatvec_t &frames)
 {