diff --git a/src/drivers/fluid_alsa.c b/src/drivers/fluid_alsa.c index 695c7d34..34f14c5e 100644 --- a/src/drivers/fluid_alsa.c +++ b/src/drivers/fluid_alsa.c @@ -147,51 +147,6 @@ static void fluid_alsa_seq_run(void* d); * */ -// Connect ALSA MIDI inputs to port_info -static void fluid_alsa_autoconnect_inputs(fluid_alsa_seq_driver_t* dev, const snd_seq_port_info_t *port_info) -{ - snd_seq_t *seq = dev->seq_handle; - snd_seq_port_subscribe_t *subs; - snd_seq_client_info_t *cinfo; - snd_seq_port_info_t *pinfo; - - snd_seq_port_subscribe_alloca(&subs); - snd_seq_client_info_alloca(&cinfo); - snd_seq_port_info_alloca(&pinfo); - - snd_seq_client_info_set_client(cinfo, -1); - while (snd_seq_query_next_client(seq, cinfo) >= 0) { - const snd_seq_addr_t *dest = snd_seq_port_info_get_addr(port_info); - - snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); - snd_seq_port_info_set_port(pinfo, -1); - while (snd_seq_query_next_port(seq, pinfo) >= 0) { - const unsigned int needed_type = SND_SEQ_PORT_TYPE_MIDI_GENERIC; - const unsigned int needed_cap = SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ; - const snd_seq_addr_t *sender = snd_seq_port_info_get_addr(pinfo); - const char *pname = snd_seq_port_info_get_name(pinfo); - - if ((snd_seq_port_info_get_type(pinfo) & needed_type) != needed_type) - continue; - if ((snd_seq_port_info_get_capability(pinfo) & needed_cap) != needed_cap) - continue; - - snd_seq_port_subscribe_set_sender(subs, sender); - snd_seq_port_subscribe_set_dest(subs, dest); - - if (snd_seq_get_port_subscription(seq, subs) == 0) { - FLUID_LOG(FLUID_WARN, "Connection %s is already subscribed\n", pname); - continue; - } - if (snd_seq_subscribe_port(seq, subs) < 0) { - FLUID_LOG(FLUID_ERR, "Connection of %s failed (%s)\n", pname, snd_strerror(errno)); - continue; - } - FLUID_LOG(FLUID_INFO, "Connection of %s succeeded\n", pname); - } - } -} - void fluid_alsa_audio_driver_settings(fluid_settings_t* settings) { fluid_settings_register_str(settings, "audio.alsa.device", "default", 0, NULL, NULL); @@ -797,6 +752,50 @@ static char* fluid_alsa_seq_full_name(char* id, int port, char* buf, int len) return buf; } +// Connect available ALSA MIDI inputs to port_info +static void fluid_alsa_seq_autoconnect(fluid_alsa_seq_driver_t* dev, const snd_seq_port_info_t *port_info) +{ + snd_seq_t *seq = dev->seq_handle; + snd_seq_port_subscribe_t *subs; + snd_seq_client_info_t *cinfo; + snd_seq_port_info_t *pinfo; + + snd_seq_port_subscribe_alloca(&subs); + snd_seq_client_info_alloca(&cinfo); + snd_seq_port_info_alloca(&pinfo); + + snd_seq_client_info_set_client(cinfo, -1); + while (snd_seq_query_next_client(seq, cinfo) >= 0) { + const snd_seq_addr_t *dest = snd_seq_port_info_get_addr(port_info); + + snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); + snd_seq_port_info_set_port(pinfo, -1); + while (snd_seq_query_next_port(seq, pinfo) >= 0) { + const unsigned int needed_type = SND_SEQ_PORT_TYPE_MIDI_GENERIC; + const unsigned int needed_cap = SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ; + const snd_seq_addr_t *sender = snd_seq_port_info_get_addr(pinfo); + const char *pname = snd_seq_port_info_get_name(pinfo); + + if ((snd_seq_port_info_get_type(pinfo) & needed_type) != needed_type) + continue; + if ((snd_seq_port_info_get_capability(pinfo) & needed_cap) != needed_cap) + continue; + + snd_seq_port_subscribe_set_sender(subs, sender); + snd_seq_port_subscribe_set_dest(subs, dest); + + if (snd_seq_get_port_subscription(seq, subs) == 0) { + FLUID_LOG(FLUID_WARN, "Connection %s is already subscribed\n", pname); + continue; + } + if (snd_seq_subscribe_port(seq, subs) < 0) { + FLUID_LOG(FLUID_ERR, "Connection of %s failed (%s)\n", pname, snd_strerror(errno)); + continue; + } + FLUID_LOG(FLUID_INFO, "Connection of %s succeeded\n", pname); + } + } +} /* * new_fluid_alsa_seq_driver @@ -938,7 +937,7 @@ new_fluid_alsa_seq_driver(fluid_settings_t* settings, fluid_settings_getint(settings, "audio.alsa.autoconnect", &autoconn_inputs); if (autoconn_inputs) - fluid_alsa_autoconnect_inputs(dev, port_info); + fluid_alsa_seq_autoconnect(dev, port_info); /* tell the lash server our client id */ #ifdef LASH_ENABLED