diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-03 10:59:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 10:59:29 +0200 |
| commit | 8c23236e1db6afcb06c02daec845eca8fdb487bc (patch) | |
| tree | c03b1bcfda66de03ea4afdc63e0aeaf1352f4bb4 | |
| parent | 64d781eb6e6108123f5bba23598c1be87073cdf8 (diff) | |
| parent | 958d79828b1997fc040ebd1a3e5b63650a54193b (diff) | |
Merge pull request #48350 from RandomShaper/fix_alsamidi_crash
Fix crash when using ALSA MIDI with PulseAudio
| -rw-r--r-- | drivers/pulseaudio/audio_driver_pulseaudio.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index 0f8f2260f2..5e2431d44e 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -35,6 +35,10 @@ #include "core/config/project_settings.h" #include "core/os/os.h" +#ifdef ALSAMIDI_ENABLED +#include "drivers/alsa/asound-so_wrap.h" +#endif + void AudioDriverPulseAudio::pa_state_cb(pa_context *c, void *userdata) { AudioDriverPulseAudio *ad = (AudioDriverPulseAudio *)userdata; @@ -272,6 +276,10 @@ Error AudioDriverPulseAudio::init() { #else int dylibloader_verbose = 0; #endif +#ifdef ALSAMIDI_ENABLED + // If using PulseAudio with ALSA MIDI, we need to initialize ALSA as well + initialize_asound(dylibloader_verbose); +#endif if (initialize_pulse(dylibloader_verbose)) { return ERR_CANT_OPEN; } |