zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-22 23:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #434 from rncbc/jack_driver-last_client-reuse-fix

Browse source 
jack_driver: last_client reuse fix.
This commit is contained in:
Tom M 2018-09-20 20:20:55 +02:00 committed by GitHub
commit fb684aa5d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/drivers/fluid_jack.c
View file

@ -137,7 +137,7 @@ new_fluid_jack_client(fluid_settings_t *settings, int isaudio, void *driver)
* then re-use the client. */
if(last_client &&
(last_client->server != NULL && server != NULL && FLUID_STRCMP(last_client->server, server) == 0) &&
((!isaudio && last_client->midi_driver != NULL) || (isaudio && last_client->audio_driver != NULL)))
((!isaudio && last_client->midi_driver == NULL) || (isaudio && last_client->audio_driver == NULL)))
{
client_ref = last_client;
last_client = NULL; /* No more pairing for this client */
@ -670,7 +670,7 @@ fluid_jack_driver_process(jack_nframes_t nframes, void *arg)
}
else
{
fluid_audio_func_t callback = (audio_driver->callback != NULL) ? audio_driver->callback : fluid_synth_process;
fluid_audio_func_t callback = (audio_driver->callback != NULL) ? audio_driver->callback : (fluid_audio_func_t) fluid_synth_process;
for(i = 0; i < audio_driver->num_output_ports; i++)
{