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

Use cancellable serialiser; add some more profiling points

 
 #ifdef HAVE_MAD
 
 #include "MP3FileReader.h"
 #include "base/ProgressReporter.h"
+#include "base/Profiler.h"
 
 #include "system/System.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

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

         }
         delete[] m_reader->m_sampleBuffer;
         m_reader->m_sampleBuffer = nullptr;
     }
 
-    if (m_reader->isDecodeCacheInitialised()) m_reader->finishDecodeCache();
+    if (m_reader->isDecodeCacheInitialised()) {
+        m_reader->finishDecodeCache();
+    }
 
     m_reader->m_done = true;
     m_reader->m_completion = 100;
 
     m_reader->endSerialised();

 
         initialiseDecodeCache();
 
         if (m_cacheMode == CacheInTemporaryFile) {
 //            SVDEBUG << "MP3FileReader::accept: channel count " << m_channelCount << ", file rate " << m_fileRate << ", about to start serialised section" << endl;
-            startSerialised("MP3FileReader::Decode");
+            startSerialised("MP3FileReader::Decode", &m_cancelled);
+            if (m_cancelled) {
+                return MAD_FLOW_STOP;
+            }
         }
     }
     
     if (m_bitrateDenom > 0) {
         double bitrate = m_bitrateNum / m_bitrateDenom;