LADI
/
jackdbus
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
falkTX 2019-10-06 23:22:40 +01:00
parent 3c340b8154 37250ff470
commit ef6ee6a049
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/alsa/alsa_rawmidi.c
View File

@ -411,7 +411,7 @@ void midi_port_init(const alsa_rawmidi_t *midi, midi_port_t *port, snd_rawmidi_i
port->id = *id;
snprintf(port->dev, sizeof(port->dev), "hw:%d,%d,%d", id->id[0], id->id[1], id->id[3]);
snprintf(port->device_name, sizeof(port->device_name), snd_rawmidi_info_get_name(info));
strncpy(port->device_name, snd_rawmidi_info_get_name(info), sizeof(port->device_name));
name = snd_rawmidi_info_get_subdevice_name(info);
if (!strlen(name))
name = port->device_name;
@ -468,7 +468,7 @@ int midi_port_open(alsa_rawmidi_t *midi, midi_port_t *port)
/* Some devices (emu10k1) have subdevs with the same name,
* and we need to generate unique port name for jack */
snprintf(name, sizeof(name), "%s", port->name);
strncpy(name, port->name, sizeof(name));
if (midi_port_open_jack(midi, port, type, name)) {
int num;
num = port->id.id[3] ? port->id.id[3] : port->id.id[1];