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

rename delete_fluid_list_mod => delete_fluid_mod_list

Browse source
This commit is contained in:
derselbst 2019-10-11 09:35:34 +02:00
parent 047a069054
commit 39bf8f01cb
6 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sfloader/fluid_defsfont.c
View file

@ -1369,8 +1369,8 @@ delete_fluid_preset_zone(fluid_preset_zone_t *zone)
fluid_return_if_fail(zone != NULL);
delete_fluid_list_mod(zone->mod); /* unlinked modulators */
delete_fluid_list_mod(zone->linked_mod);/* linked modulators */
delete_fluid_mod_list(zone->mod); /* unlinked modulators */
delete_fluid_mod_list(zone->linked_mod);/* linked modulators */
for(list = zone->voice_zone; list != NULL; list = fluid_list_next(list))
{
@ -1462,7 +1462,7 @@ static void fluid_limit_mod_list(char *list_name, fluid_mod_t **list_mod)
*list_mod = NULL;
}
delete_fluid_list_mod(mod);
delete_fluid_mod_list(mod);
FLUID_LOG(FLUID_WARN, "%s, modulators count limited to %d", list_name,
FLUID_NUM_MOD);
break;
@ -2020,8 +2020,8 @@ delete_fluid_inst_zone(fluid_inst_zone_t *zone)
{
fluid_return_if_fail(zone != NULL);
delete_fluid_list_mod(zone->mod); /* unlinked modulators */
delete_fluid_list_mod(zone->linked_mod);/* linked modulators */
delete_fluid_mod_list(zone->mod); /* unlinked modulators */
delete_fluid_mod_list(zone->linked_mod);/* linked modulators */
FLUID_FREE(zone->name);
FLUID_FREE(zone);

4
src/synth/fluid_mod.c
View file

@ -578,7 +578,7 @@ delete_fluid_mod(fluid_mod_t *mod)
/*
* delete list of modulators.
*/
void delete_fluid_list_mod(fluid_mod_t *mod)
void delete_fluid_mod_list(fluid_mod_t *mod)
{
fluid_mod_t *tmp;
@ -1547,7 +1547,7 @@ fluid_mod_copy_linked_mod(const fluid_mod_t *list_mod, int dest_idx, int new_idx
mod_cpy = new_fluid_mod(); /* next field is set to NULL */
if(mod_cpy == NULL)
{
delete_fluid_list_mod(*linked_mod); /* freeing */
delete_fluid_mod_list(*linked_mod); /* freeing */
*linked_mod = NULL;
return FLUID_FAILED;
}

2
src/synth/fluid_mod.h
View file

@ -87,7 +87,7 @@ int fluid_mod_check_linked_mod(char *list_name,
fluid_mod_t *list_mod, int mod_count,
fluid_mod_t **linked_mod, int linked_count);
void delete_fluid_list_mod(fluid_mod_t *mod);
void delete_fluid_mod_list(fluid_mod_t *mod);
#ifdef DEBUG
void fluid_dump_modulator(fluid_mod_t *mod);

2
src/synth/fluid_synth.c
View file

@ -1103,7 +1103,7 @@ delete_fluid_synth(fluid_synth_t *synth)
#endif
/* delete all default modulators */
delete_fluid_list_mod(synth->default_mod);
delete_fluid_mod_list(synth->default_mod);
FLUID_FREE(synth->overflow.important_channels);

12
test/test_fluid_zone_check_mod.c
View file

@ -24,7 +24,7 @@ Usage:
int fluid_zone_check_mod(char *zone_name, fluid_mod_t **list_mod,
fluid_mod_t **linked_mod);
// implemented in fluid_defsfont.c
void delete_fluid_list_mod(fluid_mod_t *list_mod);
void delete_fluid_mod_list(fluid_mod_t *list_mod);
//----------------------------------------------------------------------------
static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod);
@ -1157,10 +1157,10 @@ test_fluid_zone_check_mod(char * name_test,
FLUID_LOG(FLUID_INFO, "***** End %s ****", name_test);
FLUID_LOG(FLUID_INFO, "===================================================");
delete_fluid_list_mod(list_mod0);
delete_fluid_list_mod(linked_mod0);
delete_fluid_list_mod(list_mod1);
delete_fluid_list_mod(linked_mod1);
delete_fluid_mod_list(list_mod0);
delete_fluid_mod_list(linked_mod0);
delete_fluid_mod_list(list_mod1);
delete_fluid_mod_list(linked_mod1);
return FLUID_OK;
}
@ -1181,7 +1181,7 @@ static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod)
if(mod == NULL)
{
FLUID_LOG(FLUID_ERR, "Out of memory");
delete_fluid_list_mod(list_mod);
delete_fluid_mod_list(list_mod);
return NULL;
}

30
test/test_modulator_links.c
View file

@ -9,7 +9,7 @@ These tests check fluid_mod_check_linked_mod() function.
//----------------------------------------------------------------------------
/* external functions */
void delete_fluid_list_mod(fluid_mod_t *list_mod);
void delete_fluid_mod_list(fluid_mod_t *list_mod);
//----------------------------------------------------------------------------
static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod);
@ -143,7 +143,7 @@ int main(void)
list_of_mods, 0, &linked_mod, 0);
TEST_ASSERT(linked_count == 3);
TEST_ASSERT(linked_mod != NULL);
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// same list that Test 2, but changed order
@ -188,7 +188,7 @@ int main(void)
list_of_mods, 0, &linked_mod, 0);
TEST_ASSERT(linked_count == 3);
TEST_ASSERT(linked_mod != NULL);
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// Test 3.2: Same as 3 but again change order.
@ -311,7 +311,7 @@ int main(void)
// m2 flags2 must be identic to mod2 flags2
TEST_ASSERT(fluid_mod_get_flags2(m2)== fluid_mod_get_flags2(mod2));
}
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// Test 3.3: Same list as 3.2 but we add another complex modulator in list_of_mods.
@ -492,7 +492,7 @@ int main(void)
// m5 flags2 must be identic to mod4 flags2
TEST_ASSERT(fluid_mod_get_flags2(m5)== fluid_mod_get_flags2(mod4));
}
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// same list that test 3, but with additional mod3 that points to mod1 without mod1 having FLUID_MOD_LINK_SRC
@ -562,7 +562,7 @@ int main(void)
list_of_mods, 0, &linked_mod, 0);
TEST_ASSERT(linked_count == 3);
TEST_ASSERT(linked_mod != NULL);
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// same list than test 4, with additional mod3 and valid mod1 this time
@ -613,7 +613,7 @@ int main(void)
list_of_mods, 0, &linked_mod, 0);
TEST_ASSERT(linked_count == 4);
TEST_ASSERT(linked_mod != NULL);
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// Look like circular circular complex modulators, but it isn't not circular !
@ -705,7 +705,7 @@ int main(void)
list_of_mods, 0, &linked_mod, 0);
TEST_ASSERT(linked_count == 2);
TEST_ASSERT(linked_mod != NULL);
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// Another circular complex modulators
@ -1115,7 +1115,7 @@ int main(void)
list_of_mods, 0, &linked_mod, 0);
TEST_ASSERT(linked_count == 2);
TEST_ASSERT(linked_mod != NULL);
delete_fluid_list_mod(linked_mod);
delete_fluid_mod_list(linked_mod);
}
// Test 10: check and get a list of linked modulators in a table supplied by the caller.
@ -1227,9 +1227,9 @@ int main(void)
TEST_ASSERT(fluid_list_test_identity(linked_mod1, linked_mod2) == TRUE);
// freeing: linked_mod2 is supplied as a table on stack. It must not freed !
delete_fluid_list_mod(list_mod1);
delete_fluid_list_mod(list_mod2);
delete_fluid_list_mod(linked_mod1);
delete_fluid_mod_list(list_mod1);
delete_fluid_mod_list(list_mod2);
delete_fluid_mod_list(linked_mod1);
}
// Test 11: same as test 10 except input list_mod2 is a table supplied by the caller
@ -1347,8 +1347,8 @@ int main(void)
// freeing: list_mod2 is supplied as a table. It must not freed !
// linked_mod2 is supplied as a table on stack. It must not freed !
delete_fluid_list_mod(list_mod1);
delete_fluid_list_mod(linked_mod1);
delete_fluid_mod_list(list_mod1);
delete_fluid_mod_list(linked_mod1);
}
delete_fluid_mod(mod0);
@ -1379,7 +1379,7 @@ static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod)
if(mod == NULL)
{
FLUID_LOG(FLUID_ERR, "Out of memory");
delete_fluid_list_mod(list_mod);
delete_fluid_mod_list(list_mod);
return NULL;
}