Ticket #988: jack-use-more-ports.patch

libao2/ao_jack.

@@ -229 +229 @@
     {NULL}
   };
   int port_flags = JackPortIsInput;
-  int i;
+  int i, j;
   estimate = 1;
   if (subopt_parse(ao_subdevice, subopts) != 0) {
     print_help();
@@ -252 +252 @@
   jack_set_process_callback(client, outputaudio, 0);
 
   // list matching ports
+  mp_msg(MSGT_AO, MSGL_V, "[JACK] searching for ports named \"%s\" to connect to\n", port_name);
+
   if (!port_name)
     port_flags |= JackPortIsPhysical;
   matching_ports = jack_get_ports(client, port_name, NULL, port_flags);
@@ -260 +262 @@
     mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] no physical ports available\n");
     goto err_out;
   }
+
+  mp_msg(MSGT_AO, MSGL_V, "[JACK] We have %d channels and found %d ports\n", channels, num_ports);
+
+  // originally, port-connections were limited here
+  // num_ports will be set to channels futher down, after connecting the ports
+/*
   if (channels > num_ports) channels = num_ports;
   num_ports = channels;
+*/
 
-  // create out output ports
-  for (i = 0; i < num_ports; i++) {
+  // create output ports
+  for (i = 0; i < channels; i++) {
     char pname[30];
     snprintf(pname, 30, "out_%d", i);
     ports[i] = jack_port_register(client, pname, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
@@ -278 +287 @@
     goto err_out;
   }
   for (i = 0; i < num_ports; i++) {
-    if (jack_connect(client, jack_port_name(ports[i]), matching_ports[i])) {
+    // this is quite a hack since it assumes that we only found ports that
+    // "fit well" with our number of channels
+    j = i % channels;
+    /* printf("Connecting our port %d to matching port %d (%s) ... ", j, i, matching_ports[i]); */
+    if (jack_connect(client, jack_port_name(ports[j]), matching_ports[i])) {
       mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] connecting failed\n");
       goto err_out;
+    } else {
+      /* printf("connection ok!\n"); */
     }
   }
+
+  // moved here; mplayer crashes if we don't set this, used again at outputaudio
+  // (wouldn't it be better to use channels instead of num_ports in the callback-functions?)
+  num_ports = channels;
+
   rate = jack_get_sample_rate(client);
   jack_latency = (float)(jack_port_get_total_latency(client, ports[0]) +
                          jack_get_buffer_size(client)) / (float)rate;