Conflict resolution.

This commit is contained in:
OBattler
2023-09-21 20:44:44 +02:00
406 changed files with 8810 additions and 5865 deletions

View File

@@ -152,7 +152,7 @@ midi_out_device_has_config(int card)
return devices[card].device->config ? 1 : 0;
}
char *
const char *
midi_out_device_get_internal_name(int card)
{
return device_get_internal_name(devices[card].device);
@@ -270,7 +270,7 @@ midi_in_device_has_config(int card)
return midi_in_devices[card].device->config ? 1 : 0;
}
char *
const char *
midi_in_device_get_internal_name(int card)
{
return device_get_internal_name(midi_in_devices[card].device);