Merge pull request #529 from hselasky/various_fixes

Fix for crash when using the JACK backend and quickly reconfiguring
jamulussoftware · Aug 29, 2020 · 05783a6 · 05783a6
2 parents 8c347a2 + ecff80f
commit 05783a6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/linux/sound.cpp b/linux/sound.cpp
@@ -240,6 +240,9 @@ int CSound::process ( jack_nframes_t nframes, void* arg )
     CSound* pSound = static_cast<CSound*> ( arg );
     int     i;
 
+    // make sure we are locked during execution
+    QMutexLocker locker(&pSound->MutexAudioProcessCb);
+
     if ( pSound->IsRunning() && ( nframes == static_cast<jack_nframes_t> ( pSound->iJACKBufferSizeMono ) ) )
     {
         // get input data pointer

diff --git a/src/soundbase.cpp b/src/soundbase.cpp
@@ -75,15 +75,15 @@ void CSoundBase::Stop()
     // set flag so that thread can leave the main loop
     bRun = false;
 
-    // give thread some time to terminate
-    if ( !bIsCallbackAudioInterface )
-    {
-        wait ( 5000 );
-    }
+    // drain the audio process callback
+    QMutexLocker locker(&MutexAudioProcessCb);
 }
 
 void CSoundBase::run()
 {
+    // make sure we are locked during execution
+    QMutexLocker locker(&MutexAudioProcessCb);
+
     // main loop of working thread
     while ( bRun )
     {

diff --git a/src/soundbase.h b/src/soundbase.h
@@ -26,6 +26,7 @@
 
 #include <QThread>
 #include <QString>
+#include <QMutex>
 #ifndef HEADLESS
 # include <QMessageBox>
 #endif
@@ -137,6 +138,7 @@ class CSoundBase : public QThread
 
     void run();
     bool bRun;
+    QMutex MutexAudioProcessCb;
 
     void             ParseMIDIMessage ( const CVector<uint8_t>& vMIDIPaketBytes );