comparison data/fileio/WavFileReader.cpp @ 175:b0f4555b625e

* Introduce WritableWaveFileModel, and use it as an output model for audio
  real-time plugin transforms.  Updates aren't working correctly yet.

 
 #include "WavFileReader.h"
 
 #include <iostream>
 
+#include <QMutexLocker>
+
 WavFileReader::WavFileReader(QString path) :
     m_file(0),
     m_path(path),
     m_buffer(0),
     m_bufsiz(0),

 
     m_fileInfo.format = 0;
     m_fileInfo.frames = 0;
     m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
 
-    if (!m_file || m_fileInfo.frames <= 0 || m_fileInfo.channels <= 0) {
+    if (!m_file || m_fileInfo.channels <= 0) {
 	std::cerr << "WavFileReader::initialize: Failed to open file ("
 		  << sf_strerror(m_file) << ")" << std::endl;
 
 	if (m_file) {
 	    m_error = QString("Couldn't load audio file '%1':\n%2")

     }
 
     m_frameCount = m_fileInfo.frames;
     m_channelCount = m_fileInfo.channels;
     m_sampleRate = m_fileInfo.samplerate;
+
+    std::cerr << "WavFileReader: Frame count " << m_frameCount << ", channel count " << m_channelCount << ", sample rate " << m_sampleRate << std::endl;
+
 }
 
 WavFileReader::~WavFileReader()
 {
     if (m_file) sf_close(m_file);
 }
 
 void
+WavFileReader::updateFrameCount()
+{
+    QMutexLocker locker(&m_mutex);
+
+    size_t prevCount = m_fileInfo.frames;
+
+    if (m_file) {
+        sf_close(m_file);
+        m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
+        if (!m_file || m_fileInfo.channels <= 0) {
+            std::cerr << "WavFileReader::updateFrameCount: Failed to open file ("
+                      << sf_strerror(m_file) << ")" << std::endl;
+        }
+    }
+
+    std::cerr << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << std::endl;
+
+    if (m_fileInfo.frames != prevCount) emit frameCountChanged();
+}
+
+void
 WavFileReader::getInterleavedFrames(size_t start, size_t count,
 				    SampleBlock &results) const
 {
+    if (count == 0) return;
     results.clear();
-    if (!m_file || !m_channelCount) return;
-    if (count == 0) return;
+
+    QMutexLocker locker(&m_mutex);
+
+    if (!m_file || !m_channelCount) {
+        return;
+    }
 
     if ((long)start >= m_fileInfo.frames) {
+//        std::cerr << "WavFileReader::getInterleavedFrames: " << start
+//                  << " > " << m_fileInfo.frames << std::endl;
 	return;
     }
 
     if (long(start + count) > m_fileInfo.frames) {
 	count = m_fileInfo.frames - start;
     }
 
     sf_count_t readCount = 0;
 
-    m_mutex.lock();
-
     if (start != m_lastStart || count != m_lastCount) {
 
 	if (sf_seek(m_file, start, SEEK_SET) < 0) {
-	    m_mutex.unlock();
+//            std::cerr << "sf_seek failed" << std::endl;
 	    return;
 	}
 	
 	if (count * m_fileInfo.channels > m_bufsiz) {
 //	    std::cerr << "WavFileReader: Reallocating buffer for " << count

 	    delete[] m_buffer;
 	    m_buffer = new float[m_bufsiz];
 	}
 	
 	if ((readCount = sf_readf_float(m_file, m_buffer, count)) < 0) {
-	    m_mutex.unlock();
+//            std::cerr << "sf_readf_float failed" << std::endl;
 	    return;
 	}
 
 	m_lastStart = start;
 	m_lastCount = readCount;

 
     for (size_t i = 0; i < count * m_fileInfo.channels; ++i) {
 	results.push_back(m_buffer[i]);
     }
 
-    m_mutex.unlock();
     return;
 }
 
 void
 WavFileReader::getSupportedExtensions(std::set<QString> &extensions)