zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-15 20:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize device search

Browse source 
Search of the MIDI device can be done before allocating the struct for the driver.
This commit is contained in:
carlo-bramini 2018-11-25 21:13:25 +01:00 committed by GitHub
parent fa924516f0
commit 26325edb22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/drivers/fluid_winmidi.c
View file

@ -224,24 +224,11 @@ new_fluid_winmidi_driver(fluid_settings_t *settings,
return NULL;
}
dev = FLUID_MALLOC(sizeof(fluid_winmidi_driver_t));
if(dev == NULL)
{
return NULL;
}
FLUID_MEMSET(dev, 0, sizeof(fluid_winmidi_driver_t));
dev->hmidiin = NULL;
dev->driver.handler = handler;
dev->driver.data = data;
/* get the device name. if none is specified, use the default device. */
if(fluid_settings_copystr(settings, "midi.winmidi.device", dev_name, MAXPNAMELEN) != FLUID_OK)
{
FLUID_LOG(FLUID_ERR, "Error getting MIDI device name");
goto error_recovery;
return NULL;
}
/* check if there any midi devices installed */
@ -250,7 +237,7 @@ new_fluid_winmidi_driver(fluid_settings_t *settings,
if(num == 0)
{
FLUID_LOG(FLUID_ERR, "no MIDI in devices found");
goto error_recovery;
return NULL;
}
/* find the device */
@ -276,10 +263,23 @@ new_fluid_winmidi_driver(fluid_settings_t *settings,
if(midi_num != i)
{
FLUID_LOG(FLUID_ERR, "Device <%s> does not exists", dev_name);
goto error_recovery;
return NULL;
}
}
dev = FLUID_MALLOC(sizeof(fluid_winmidi_driver_t));
if(dev == NULL)
{
return NULL;
}
FLUID_MEMSET(dev, 0, sizeof(fluid_winmidi_driver_t));
dev->hmidiin = NULL;
dev->driver.handler = handler;
dev->driver.data = data;
/* try opening the device */
res = midiInOpen(&dev->hmidiin, midi_num,
(DWORD_PTR) fluid_winmidi_callback,