zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-10 15:01:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix build when no audio drivers are supported

Browse source
This commit is contained in:
derselbst 2018-10-20 14:54:42 +02:00
parent ebc177f48f
commit 5bd07c120c
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/drivers/fluid_adriver.c
View file

@ -138,6 +138,8 @@ static const fluid_audriver_definition_t fluid_audio_drivers[] =
NULL
},
#endif
/* NULL terminator to avoid zero size array if no driver available */
{ NULL, NULL, NULL, NULL, NULL }
};
#define ENABLE_AUDIO_DRIVER(_drv, _idx) \
@ -227,7 +229,7 @@ void fluid_audio_driver_settings(fluid_settings_t *settings)
fluid_settings_add_option(settings, "audio.driver", "file");
#endif
for(i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers); i++)
for(i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers) - 1; i++)
{
if(fluid_audio_drivers[i].settings != NULL &&
IS_AUDIO_DRIVER_ENABLED(fluid_adriver_disable_mask, i))
@ -244,7 +246,7 @@ find_fluid_audio_driver(fluid_settings_t *settings)
char *name;
char *allnames;
for(i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers); i++)
for(i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers) - 1; i++)
{
/* If this driver is de-activated, just ignore it */
if(!IS_AUDIO_DRIVER_ENABLED(fluid_adriver_disable_mask, i))
@ -363,7 +365,7 @@ delete_fluid_audio_driver(fluid_audio_driver_t *driver)
fluid_return_if_fail(driver != NULL);
/* iterate over fluid_audio_drivers_template to ensure deleting even drivers currently not registered */
for(i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers); i++)
for(i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers) - 1; i++)
{
if(fluid_audio_drivers[i].name == driver->name)
{
@ -417,8 +419,8 @@ int fluid_audio_driver_register(const char **adrivers)
{
unsigned int j;
/* search the requested audio driver in the template and copy it over if found */
for(j = 0; j < FLUID_N_ELEMENTS(fluid_audio_drivers); j++)
/* search the requested audio driver in the template and enable it if found */
for(j = 0; j < FLUID_N_ELEMENTS(fluid_audio_drivers) - 1; j++)
{
if(FLUID_STRCMP(adrivers[i], fluid_audio_drivers[j].name) == 0)
{
@ -427,19 +429,13 @@ int fluid_audio_driver_register(const char **adrivers)
}
}
if(j >= FLUID_N_ELEMENTS(fluid_audio_drivers))
if(j >= FLUID_N_ELEMENTS(fluid_audio_drivers) - 1)
{
/* requested driver not found, failure */
return FLUID_FAILED;
}
}
if(i >= FLUID_N_ELEMENTS(fluid_audio_drivers))
{
/* user requested more drivers than this build of fluidsynth supports, failure */
return FLUID_FAILED;
}
/* Update list of activated drivers */
FLUID_MEMCPY(fluid_adriver_disable_mask, disable_mask, sizeof(disable_mask));