mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2024-12-11 21:31:18 +00:00
Merge pull request #255 from FluidSynth/alsa-autocon
Autoconnect ALSA MIDI inputs.
This commit is contained in:
commit
ad9c185dca
3 changed files with 59 additions and 0 deletions
|
@ -404,6 +404,14 @@ https://stackoverflow.com/a/6251757
|
||||||
<midi>
|
<midi>
|
||||||
<setting>
|
<setting>
|
||||||
<isFirst>MIDI driver settings</isFirst>
|
<isFirst>MIDI driver settings</isFirst>
|
||||||
|
<name>autoconnect</name>
|
||||||
|
<type>bool</type>
|
||||||
|
<def>0 (FALSE)</def>
|
||||||
|
<desc>
|
||||||
|
If 1 (TRUE), automatically connects FluidSynth to available MIDI input ports. alsa_seq is currently the only driver making use of this.
|
||||||
|
</desc>
|
||||||
|
</setting>
|
||||||
|
<setting>
|
||||||
<name>driver</name>
|
<name>driver</name>
|
||||||
<type>str</type>
|
<type>str</type>
|
||||||
<def>alsa_seq (Linux),<br />
|
<def>alsa_seq (Linux),<br />
|
||||||
|
|
|
@ -757,6 +757,50 @@ static char* fluid_alsa_seq_full_name(char* id, int port, char* buf, int len)
|
||||||
return buf;
|
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
|
* new_fluid_alsa_seq_driver
|
||||||
|
@ -766,6 +810,7 @@ new_fluid_alsa_seq_driver(fluid_settings_t* settings,
|
||||||
handle_midi_event_func_t handler, void* data)
|
handle_midi_event_func_t handler, void* data)
|
||||||
{
|
{
|
||||||
int i, err;
|
int i, err;
|
||||||
|
int autoconn_inputs = 0;
|
||||||
fluid_alsa_seq_driver_t* dev;
|
fluid_alsa_seq_driver_t* dev;
|
||||||
int realtime_prio = 0;
|
int realtime_prio = 0;
|
||||||
int count;
|
int count;
|
||||||
|
@ -895,6 +940,10 @@ new_fluid_alsa_seq_driver(fluid_settings_t* settings,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fluid_settings_getint(settings, "midi.autoconnect", &autoconn_inputs);
|
||||||
|
if (autoconn_inputs)
|
||||||
|
fluid_alsa_seq_autoconnect(dev, port_info);
|
||||||
|
|
||||||
/* tell the lash server our client id */
|
/* tell the lash server our client id */
|
||||||
#ifdef LASH_ENABLED
|
#ifdef LASH_ENABLED
|
||||||
{
|
{
|
||||||
|
|
|
@ -144,6 +144,8 @@ void fluid_midi_driver_settings(fluid_settings_t* settings)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
|
fluid_settings_register_int (settings, "midi.autoconnect", 0, 0, 1, FLUID_HINT_TOGGLED, NULL, NULL);
|
||||||
|
|
||||||
fluid_settings_register_int (settings, "midi.realtime-prio",
|
fluid_settings_register_int (settings, "midi.realtime-prio",
|
||||||
FLUID_DEFAULT_MIDI_RT_PRIO, 0, 99, 0, NULL, NULL);
|
FLUID_DEFAULT_MIDI_RT_PRIO, 0, 99, 0, NULL, NULL);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue