Merge remote-tracking branch 'origin/master' into win-v2

This commit is contained in:
Birch-san 2019-08-03 16:46:50 +01:00
commit 8760d1bc1a
No known key found for this signature in database
GPG Key ID: 726D53FF6A26AB9D

View File

@ -59,13 +59,13 @@ FluidSynthModel::~FluidSynthModel() {
} }
void FluidSynthModel::initialise() { void FluidSynthModel::initialise() {
settings = { new_fluid_settings(), delete_fluid_settings };
// deactivate all audio drivers in fluidsynth to avoid FL Studio deadlock when initialising CoreAudio // deactivate all audio drivers in fluidsynth to avoid FL Studio deadlock when initialising CoreAudio
// after all: we only use fluidsynth to render blocks of audio. it doesn't output to audio driver. // after all: we only use fluidsynth to render blocks of audio. it doesn't output to audio driver.
const char *DRV[] {NULL}; const char *DRV[] {NULL};
fluid_audio_driver_register(DRV); fluid_audio_driver_register(DRV);
settings = { new_fluid_settings(), delete_fluid_settings };
// https://sourceforge.net/p/fluidsynth/wiki/FluidSettings/ // https://sourceforge.net/p/fluidsynth/wiki/FluidSettings/
#if JUCE_DEBUG #if JUCE_DEBUG
fluid_settings_setint(settings.get(), "synth.verbose", 1); fluid_settings_setint(settings.get(), "synth.verbose", 1);