lock pulseaudio mainloop while freeing sound devices

src/monocoque/devices/sound/usb_generic_shaker.h

@@ -5,9 +5,10 @@
 
 #ifdef USE_PULSEAUDIO
 int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop, pa_context* context, const char* devname, int volume, int pan, int channels, const char* streamname);
+int usb_generic_shaker_free(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop);
 #else
 int usb_generic_shaker_init(SoundDevice* sounddevice);
-#endif
 int usb_generic_shaker_free(SoundDevice* sounddevice);
+#endif
 
 #endif

src/monocoque/devices/sound/usb_generic_shaker_pulse.c

@@ -94,8 +94,9 @@ void stream_state_cb(pa_stream *s, void *mainloop) {
     pa_threaded_mainloop_signal(mainloop, 0);
 }
 
-int usb_generic_shaker_free(SoundDevice* sounddevice)
+int usb_generic_shaker_free(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop)
 {
+    pa_threaded_mainloop_lock(mainloop);
     int err = 0;
     if (sounddevice->stream)
     {
@@ -104,6 +105,7 @@ int usb_generic_shaker_free(SoundDevice* sounddevice)
         // why is this wrong
         //pa_xfree(sounddevice->stream);
     }
+    pa_threaded_mainloop_unlock(mainloop);
     return err;
 }
 

src/monocoque/devices/sounddevice.c

@@ -102,6 +102,21 @@ int sounddev_gearshift_update(SimDevice* this, SimData* simdata)
     gear_sound_set(sounddevice, simdata);
 }
 
+
+#ifdef USE_PULSEAUDIO
+
+int sounddev_free(SimDevice* this)
+{
+    SoundDevice* sounddevice = (void *) this->derived;
+
+    usb_generic_shaker_free(sounddevice, mainloop);
+
+    free(sounddevice);
+
+    return 0;
+}
+
+#else
 int sounddev_free(SimDevice* this)
 {
     SoundDevice* sounddevice = (void *) this->derived;
@@ -112,6 +127,7 @@ int sounddev_free(SimDevice* this)
 
     return 0;
 }
+#endif
 
 int sounddev_init(SoundDevice* sounddevice, const char* devname, int volume, int frequency, int pan, int channels, double duration, double threshold)
 {