comparison data/fileio/CodedAudioFileReader.cpp @ 263:71dfc6ab3b54

* Threaded mp3/ogg file reading.  Not activated yet, as it doesn't work
  in context (SV needs to know the duration of its main model at the outset)

 #include "base/Exceptions.h"
 #include "base/Profiler.h"
 
 #include <iostream>
 #include <QDir>
+#include <QMutexLocker>
 
 CodedAudioFileReader::CodedAudioFileReader(CacheMode cacheMode) :
     m_cacheMode(cacheMode),
     m_initialised(false),
     m_cacheFileWritePtr(0),

 {
 }
 
 CodedAudioFileReader::~CodedAudioFileReader()
 {
+    QMutexLocker locker(&m_cacheMutex);
+
     if (m_cacheFileWritePtr) sf_close(m_cacheFileWritePtr);
     if (m_cacheFileReader) delete m_cacheFileReader;
     if (m_cacheWriteBuffer) delete[] m_cacheWriteBuffer;
 
     if (m_cacheFileName != "") {

 }
 
 void
 CodedAudioFileReader::initialiseDecodeCache()
 {
+    QMutexLocker locker(&m_cacheMutex);
+
     if (m_cacheMode == CacheInTemporaryFile) {
 
         m_cacheWriteBuffer = new float[m_cacheWriteBufferSize * m_channelCount];
         m_cacheWriteBufferIndex = 0;
 

 }
 
 void
 CodedAudioFileReader::addSampleToDecodeCache(float sample)
 {
+    QMutexLocker locker(&m_cacheMutex);
+
     if (!m_initialised) return;
 
     switch (m_cacheMode) {
 
     case CacheInTemporaryFile:

 }
 
 void
 CodedAudioFileReader::finishDecodeCache()
 {
+    QMutexLocker locker(&m_cacheMutex);
+
     Profiler profiler("CodedAudioFileReader::finishDecodeCache", true);
 
     if (!m_initialised) {
         std::cerr << "WARNING: CodedAudioFileReader::finishDecodeCache: Cache was never initialised!" << std::endl;
         return;

 
 void
 CodedAudioFileReader::getInterleavedFrames(size_t start, size_t count,
                                            SampleBlock &frames) const
 {
+    //!!! we want to ensure this doesn't require a lock -- at the
+    // moment it does need one, but it doesn't have one...
+
     if (!m_initialised) return;
 
     switch (m_cacheMode) {
 
     case CacheInTemporaryFile: