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

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

     m_path(path),
     m_progress(0),
     m_fileSize(0),
     m_bytesRead(0),
     m_cancelled(false),
+    m_completion(0),
     m_decodeThread(0)
 {
     m_frameCount = 0;
     m_channelCount = 0;
     m_sampleRate = 0;

 
 OggVorbisFileReader::~OggVorbisFileReader()
 {
     std::cerr << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (--instances) << " instances" << std::endl;
     if (m_decodeThread) {
+        m_cancelled = true;
         m_decodeThread->wait();
         delete m_decodeThread;
     }
 }
 

     m_reader->m_fishSound = 0;
     oggz_close(m_reader->m_oggz);
     m_reader->m_oggz = 0;
     
     if (m_reader->isDecodeCacheInitialised()) m_reader->finishDecodeCache();
+    m_reader->m_completion = 100;
 } 
 
 int
 OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
 {

 
     fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
     fish_sound_decode(fs, packet->packet, packet->bytes);
 
     reader->m_bytesRead += packet->bytes;
+
+    // The number of bytes read by this function is smaller than
+    // the file size because of the packet headers
+    int progress = lrint(double(reader->m_bytesRead) * 114 /
+                         double(reader->m_fileSize));
+    if (progress > 99) progress = 99;
+    reader->m_completion = progress;
     
     if (reader->m_fileSize > 0 && reader->m_progress) {
-	// The number of bytes read by this function is smaller than
-	// the file size because of the packet headers
-	int progress = lrint(double(reader->m_bytesRead) * 114 /
-			     double(reader->m_fileSize));
-	if (progress > 99) progress = 99;
 	if (progress > reader->m_progress->value()) {
 	    reader->m_progress->setValue(progress);
 	    reader->m_progress->show();
 	    reader->m_progress->raise();
 	    qApp->processEvents();
 	    if (reader->m_progress->wasCanceled()) {
 		reader->m_cancelled = true;
 	    }
 	}
-    } 
+    }
 
     if (reader->m_cancelled) return 1;
     return 0;
 }