comparison data/fileio/MP3FileReader.cpp @ 265:e08f486e8d8c

* Enable threaded decoding for Ogg and MP3 files.
  Needs some work on reducing updates to the overview widget

     m_fileSize = 0;
     m_bitrateNum = 0;
     m_bitrateDenom = 0;
     m_frameCount = 0;
     m_cancelled = false;
+    m_completion = 0;
     m_done = false;
     m_progress = 0;
 
     struct stat stat;
     if (::stat(path.toLocal8Bit().data(), &stat) == -1 || stat.st_size == 0) {

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

     m_reader->m_filebuffer = 0;
     
     if (m_reader->isDecodeCacheInitialised()) m_reader->finishDecodeCache();
 
     m_reader->m_done = true;
+    m_reader->m_completion = 100;
 } 
 
 bool
 MP3FileReader::decode(void *mm, size_t sz)
 {

     if (m_bitrateDenom > 0) {
         double bitrate = m_bitrateNum / m_bitrateDenom;
         double duration = double(m_fileSize * 8) / bitrate;
         double elapsed = double(m_frameCount) / m_sampleRate;
         double percent = ((elapsed * 100.0) / duration);
+        int progress = int(percent);
+        if (progress < 1) progress = 1;
+        if (progress > 99) progress = 99;
+        m_completion = progress;
         if (m_progress) {
-            int progress = int(percent);
-            if (progress < 1) progress = 1;
-            if (progress > 99) progress = 99;
             if (progress > m_progress->value()) {
                 m_progress->setValue(progress);
                 m_progress->show();
                 m_progress->raise();
                 qApp->processEvents();