Make audio.jack.autoconnect connect all available ports (#923)

FluidSynth · Jun 27, 2021 · 92089e0 · 92089e0
1 parent 95e3693
commit 92089e0
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/drivers/fluid_jack.c b/src/drivers/fluid_jack.c
@@ -614,14 +614,14 @@ new_fluid_jack_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t func
  {
  jack_ports = jack_get_ports(client, NULL, NULL, JackPortIsInput | JackPortIsPhysical);
 
- if(jack_ports)
+ if(jack_ports && jack_ports[0])
  {
- int err;
+ int err, o = 0;
  int connected = 0;
 
- for(i = 0; jack_ports[i] && i < 2 * dev->num_output_ports; ++i)
+ for(i = 0; i < 2 * dev->num_output_ports; ++i)
  {
- err = jack_connect(client, jack_port_name(dev->output_ports[i]), jack_ports[i]);
+ err = jack_connect(client, jack_port_name(dev->output_ports[i]), jack_ports[o++]);
 
  if(err)
  {
@@ -631,11 +631,17 @@ new_fluid_jack_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t func
  {
  connected++;
  }
+
+ if(!jack_ports[o])
+ {
+ o = 0;
+ }
  }
 
+ o = 0;
  for(i = 0; jack_ports[i] && i < 2 * dev->num_fx_ports; ++i)
  {
- err = jack_connect(client, jack_port_name(dev->fx_ports[i]), jack_ports[i]);
+ err = jack_connect(client, jack_port_name(dev->fx_ports[i]), jack_ports[o++]);
 
  if(err)
  {
@@ -645,6 +651,11 @@ new_fluid_jack_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t func
  {
  connected++;
  }
+
+ if(!jack_ports[o])
+ {
+ o = 0;
+ }
  }
 
  jack_free(jack_ports); /* free jack ports array (not the port values!) */