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

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

             fileInfo.format = SF_FORMAT_WAV | SF_FORMAT_FLOAT;
     
             m_cacheFileWritePtr = sf_open(m_cacheFileName.toLocal8Bit(),
                                           SFM_WRITE, &fileInfo);
 
-            if (!m_cacheFileWritePtr) {
+            if (m_cacheFileWritePtr) {
+
+                //!!! really want to do this now only if we're in a
+                //threaded mode -- creating the reader later if we're
+                //not threaded -- but we don't have access to that
+                //information here
+
+                m_cacheFileReader = new WavFileReader(m_cacheFileName);
+
+                if (!m_cacheFileReader->isOK()) {
+                    std::cerr << "ERROR: CodedAudioFileReader::initialiseDecodeCache: Failed to construct WAV file reader for temporary file: " << m_cacheFileReader->getError().toStdString() << std::endl;
+                    delete m_cacheFileReader;
+                    m_cacheFileReader = 0;
+                    m_cacheMode = CacheInMemory;
+                    sf_close(m_cacheFileWritePtr);
+                }
+            } else {
                 std::cerr << "CodedAudioFileReader::initialiseDecodeCache: failed to open cache file \"" << m_cacheFileName.toStdString() << "\" (" << m_channelCount << " channels, sample rate " << m_sampleRate << " for writing, falling back to in-memory cache" << std::endl;
                 m_cacheMode = CacheInMemory;
             }
+
         } catch (DirectoryCreationFailed f) {
             std::cerr << "CodedAudioFileReader::initialiseDecodeCache: failed to create temporary directory! Falling back to in-memory cache" << std::endl;
             m_cacheMode = CacheInMemory;
         }
     }

             sf_writef_float(m_cacheFileWritePtr,
                             m_cacheWriteBuffer,
                             m_cacheWriteBufferSize);
 
             m_cacheWriteBufferIndex = 0;
+
+            if (m_cacheWriteBufferIndex % 10240 == 0 &&
+                m_cacheFileReader) {
+                m_cacheFileReader->updateFrameCount();
+            }
         }
         break;
 
     case CacheInMemory:
         m_data.push_back(sample);

         m_cacheWriteBufferIndex = 0;
 
         sf_close(m_cacheFileWritePtr);
         m_cacheFileWritePtr = 0;
 
+        m_cacheFileReader->updateFrameCount();
+/*
         m_cacheFileReader = new WavFileReader(m_cacheFileName);
 
         if (!m_cacheFileReader->isOK()) {
             std::cerr << "ERROR: CodedAudioFileReader::finishDecodeCache: Failed to construct WAV file reader for temporary file: " << m_cacheFileReader->getError().toStdString() << std::endl;
             delete m_cacheFileReader;
             m_cacheFileReader = 0;
-        }
+        }*/
+
         break;
 
     case CacheInMemory:
         // nothing to do 
         break;

                                            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;
+    if (!m_initialised) {
+        std::cerr << "CodedAudioFileReader::getInterleavedFrames: not initialised" << std::endl;
+        return;
+    }
 
     switch (m_cacheMode) {
 
     case CacheInTemporaryFile:
         if (m_cacheFileReader) {