change return type of fluid_get_num_mod to int

...for consistency
This commit is contained in:
derselbst 2019-10-10 18:20:11 +02:00
parent 0637e7086b
commit c5b24141e6
3 changed files with 7 additions and 7 deletions

View file

@ -164,9 +164,9 @@ fluid_mod_get_amount(const fluid_mod_t *mod)
* @return number of modulators.
* Must be > 1 for complex modulator and 1 for unlinked modulator.
*/
unsigned char fluid_get_num_mod(const fluid_mod_t *mod)
int fluid_get_num_mod(const fluid_mod_t *mod)
{
unsigned char count =0;
int count = 0;
do
{
mod = mod->next;
@ -183,7 +183,7 @@ unsigned char fluid_get_num_mod(const fluid_mod_t *mod)
*/
int fluid_get_count_mod(const fluid_mod_t *mod)
{
int count =0;
int count = 0;
while(mod)
{
count++;
@ -993,8 +993,8 @@ int fluid_linked_mod_test_identity(fluid_mod_t *cm0,
fluid_mod_t *cm1,
unsigned char test_mode)
{
unsigned char count0 = fluid_get_num_mod(cm0);
unsigned char count1 = fluid_get_num_mod(cm1);
int count0 = fluid_get_num_mod(cm0);
int count1 = fluid_get_num_mod(cm1);
/* test of count and identity of final modulators cm0 and cm1 */
if((count0 == count1) && (count0 > 1)

View file

@ -50,7 +50,7 @@ struct _fluid_mod_t
/* bit link of destination in fluidsynth modulators */
#define FLUID_MOD_LINK_DEST (1 << 7) /* Link is bit 7 of destination */
unsigned char fluid_get_num_mod(const fluid_mod_t *mod);
int fluid_get_num_mod(const fluid_mod_t *mod);
int fluid_get_count_mod(const fluid_mod_t *mod);
fluid_mod_t *fluid_get_next_mod(fluid_mod_t *mod);

View file

@ -2280,7 +2280,7 @@ int fluid_voice_get_count_modulators(fluid_voice_t *voice)
*/
fluid_mod_t *fluid_voice_get_modulator(fluid_voice_t *voice, int mod_idx)
{
unsigned char count, i;
int count, i;
fluid_mod_t *mod;
fluid_return_val_if_fail(voice != NULL, NULL);