comparison data/fileio/BQAFileReader.cpp @ 1858:14747f24ad04

Use cancellable serialiser; add some more profiling points

     }
 }
 
 BQAFileReader::~BQAFileReader()
 {
+    Profiler profiler("BQAFileReader::~BQAFileReader");
+    
     if (m_decodeThread) {
         m_cancelled = true;
         m_decodeThread->wait();
         delete m_decodeThread;
     }
-    
+
     delete m_stream;
 }
 
 void
 BQAFileReader::cancelled()

 
 void
 BQAFileReader::DecodeThread::run()
 {
     if (m_reader->m_cacheMode == CacheInTemporaryFile) {
-        m_reader->startSerialised("BQAFileReader::Decode");
+        m_reader->startSerialised("BQAFileReader::Decode",
+                                  &m_reader->m_cancelled);
+        if (m_reader->m_cancelled) {
+            return;
+        }
     }
 
     sv_frame_t blockSize = 65536;
     floatvec_t block(blockSize * m_reader->getChannelCount(), 0.f);