comparison audio/AudioCallbackRecordTarget.cpp @ 641:dfec6c96007d

Wire up modelAboutToBeDeleted which appears to have been missed earlier - fixing crash when timer fires after model deleted e.g. on app exit

 
 #include "AudioCallbackRecordTarget.h"
 
 #include "base/ViewManagerBase.h"
 #include "base/RecordDirectory.h"
+#include "base/Debug.h"
 
 #include "data/model/WritableWaveFileModel.h"
 
 #include <QDir>
 #include <QTimer>

     recreateBuffers();
 }
 
 AudioCallbackRecordTarget::~AudioCallbackRecordTarget()
 {
+#ifdef DEBUG_AUDIO_CALLBACK_RECORD_TARGET
+    cerr << "AudioCallbackRecordTarget dtor" << endl;
+#endif
+    
     m_viewManager->setAudioRecordTarget(0);
 
     QMutexLocker locker(&m_bufPtrMutex);
     for (int c = 0; c < m_bufferCount; ++c) {
         delete m_buffers[c];

 
 #ifdef DEBUG_AUDIO_CALLBACK_RECORD_TARGET
     cerr << "AudioCallbackRecordTarget::updateModel: have " << nframes << " frames" << endl;
 #endif
 
+    if (!m_model) {
+#ifdef DEBUG_AUDIO_CALLBACK_RECORD_TARGET
+        cerr << "AudioCallbackRecordTarget::updateModel: have no model to update; I am hoping there is a good reason for this" << endl;
+#endif
+        return;
+    }
+
     float **samples = new float *[m_recordChannelCount];
     for (int c = 0; c < m_recordChannelCount; ++c) {
         samples[c] = new float[nframes];
         m_buffers[c]->read(samples[c], nframes);
     }

 
 void
 AudioCallbackRecordTarget::modelAboutToBeDeleted()
 {
     if (sender() == m_model) {
+#ifdef DEBUG_AUDIO_CALLBACK_RECORD_TARGET
+        cerr << "AudioCallbackRecordTarget::modelAboutToBeDeleted: taking note" << endl;
+#endif
         m_model = 0;
         m_recording = false;
+    } else {
+        SVCERR << "WARNING: AudioCallbackRecordTarget::modelAboutToBeDeleted: ths is not my model!" << endl;
     }
 }
 
 WritableWaveFileModel *
 AudioCallbackRecordTarget::startRecording()

         delete m_model;
         m_model = 0;
         return 0;
     }
 
+    connect(m_model, SIGNAL(aboutToBeDeleted()), 
+            this, SLOT(modelAboutToBeDeleted()));
+
     m_model->setObjectName(label);
     m_recording = true;
 
     emit recordStatusChanged(true);