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 fluid_get_count_mod => fluid_mod_get_list_count

Browse source
This commit is contained in:
derselbst 2019-10-10 18:24:30 +02:00
parent 07affccc25
commit c79ebf202a
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfloader/fluid_defsfont.c
View file

@ -1931,7 +1931,7 @@ fluid_list_check_linked_mod(char *list_name,
}
else /* lis_mod is a list of modulators */
{
mod_count = fluid_get_count_mod(list_mod);
mod_count = fluid_mod_get_list_count(list_mod);
}
if(!mod_count)

2
src/synth/fluid_mod.c
View file

@ -181,7 +181,7 @@ int fluid_mod_get_linked_count(const fluid_mod_t *mod)
* @param mod, pointer on modulator list.
* @return number of modulators.
*/
int fluid_get_count_mod(const fluid_mod_t *mod)
int fluid_mod_get_list_count(const fluid_mod_t *mod)
{
int count = 0;
while(mod)

2
src/synth/fluid_mod.h
View file

@ -51,7 +51,7 @@ struct _fluid_mod_t
#define FLUID_MOD_LINK_DEST (1 << 7) /* Link is bit 7 of destination */
int fluid_mod_get_linked_count(const fluid_mod_t *mod);
int fluid_get_count_mod(const fluid_mod_t *mod);
int fluid_mod_get_list_count(const fluid_mod_t *mod);
fluid_mod_t *fluid_get_next_mod(fluid_mod_t *mod);
int fluid_mod_has_linked_src1 (const fluid_mod_t * mod);

14
test/test_modulator_links.c
View file

@ -1193,11 +1193,11 @@ int main(void)
// list_mod1 and list_mod2 are expected not NULL, and count of modulators
// is expected to be equal to mod_count.
TEST_ASSERT(list_mod1 != NULL);
TEST_ASSERT(fluid_get_count_mod(list_mod1) == mod_count);
TEST_ASSERT(fluid_mod_get_list_count(list_mod1) == mod_count);
list_mod2 = fluid_build_list(mod_table, mod_count);
TEST_ASSERT(list_mod2 != NULL);
TEST_ASSERT(fluid_get_count_mod(list_mod2) == mod_count);
TEST_ASSERT(fluid_mod_get_list_count(list_mod2) == mod_count);
// compare input lists list_mod1, and list_mod2.
TEST_ASSERT(fluid_list_test_identity(list_mod1, list_mod2) == TRUE);
@ -1216,7 +1216,7 @@ int main(void)
//---------------------------------------------
// building output list linked_mod2 by calling fluid_list_check_linked_mod().
// linked_mod2 is allocated externally on (stack) in a table.
linked_count2_in = fluid_get_count_mod(list_mod2);
linked_count2_in = fluid_mod_get_list_count(list_mod2);
linked_mod2 = alloca( linked_count2_in * sizeof(fluid_mod_t));
// linked_mod2 is expected to be not NULL
TEST_ASSERT(linked_mod2 != NULL);
@ -1306,7 +1306,7 @@ int main(void)
// list_mod1 and list_mod2 are expected not NULL, and count of modulators
// is expected to be equal to mod_count.
TEST_ASSERT(list_mod1 != NULL);
TEST_ASSERT(fluid_get_count_mod(list_mod1) == mod_count);
TEST_ASSERT(fluid_mod_get_list_count(list_mod1) == mod_count);
//---------------------------------------------
// Same as test 10: building output list linked_mod1 by calling fluid_list_check_linked_mod().
@ -1337,7 +1337,7 @@ int main(void)
linked_count2_in);
// Table list_mod2 is espected to be initialized as a list.
TEST_ASSERT(fluid_get_count_mod(list_mod2) == mod_count);
TEST_ASSERT(fluid_mod_get_list_count(list_mod2) == mod_count);
// Both list_mod1 and list_mod2 lists are compared and expected to have identic
// element.
TEST_ASSERT(fluid_list_test_identity(list_mod1, list_mod2) == TRUE);
@ -1411,8 +1411,8 @@ static fluid_mod_t * fluid_build_list(fluid_mod_t mod_table[], int count_mod)
*/
int fluid_list_test_identity(fluid_mod_t *list_mod1, fluid_mod_t *list_mod2)
{
int count1 = fluid_get_count_mod(list_mod1);
int count2 = fluid_get_count_mod(list_mod2);
int count1 = fluid_mod_get_list_count(list_mod1);
int count2 = fluid_mod_get_list_count(list_mod2);
if (count1 != count2)
{
return FALSE;