comparison data/model/WritableWaveFileModel.cpp @ 258:96a6dd889c68

* Fix #1706924 updates not happening on derived waveform generation

 #include <QDir>
 
 #include <cassert>
 #include <iostream>
 
+//#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
 
 WritableWaveFileModel::WritableWaveFileModel(size_t sampleRate,
 					     size_t channels,
 					     QString path) :
     m_model(0),

         delete m_reader;
         m_reader = 0;
         return;
     }
 
-    connect(m_model, SLOT(modelChanged()), this, SIGNAL(modelChanged()));
-    connect(m_model, SLOT(modelChanged(size_t, size_t)),
+    connect(m_model, SIGNAL(modelChanged()), this, SIGNAL(modelChanged()));
+    connect(m_model, SIGNAL(modelChanged(size_t, size_t)),
             this, SIGNAL(modelChanged(size_t, size_t)));
 }
 
 WritableWaveFileModel::~WritableWaveFileModel()
 {

 bool
 WritableWaveFileModel::addSamples(float **samples, size_t count)
 {
     if (!m_writer) return false;
 
+#ifdef DEBUG_WRITABLE_WAVE_FILE_MODEL
+//    std::cerr << "WritableWaveFileModel::addSamples(" << count << ")" << std::endl;
+#endif
+
     if (!m_writer->writeSamples(samples, count)) {
         std::cerr << "ERROR: WritableWaveFileModel::addSamples: writer failed: " << m_writer->getError().toStdString() << std::endl;
         return false;
     }
 
     m_frameCount += count;
 
     static int updateCounter = 0;
 
     if (m_reader && m_reader->getChannelCount() == 0) {
+#ifdef DEBUG_WRITABLE_WAVE_FILE_MODEL
+        std::cerr << "WritableWaveFileModel::addSamples(" << count << "): calling updateFrameCount (initial)" << std::endl;
+#endif
         m_reader->updateFrameCount();
     } else if (++updateCounter == 100) {
+#ifdef DEBUG_WRITABLE_WAVE_FILE_MODEL
+        std::cerr << "WritableWaveFileModel::addSamples(" << count << "): calling updateFrameCount (periodic)" << std::endl;
+#endif
         if (m_reader) m_reader->updateFrameCount();
         updateCounter = 0;
     }
 
     return true;