zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-05-31 09:11:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use fluid_list_get to access list entry data

Browse source
This commit is contained in:
Marcus Weseloh 2018-04-04 11:03:47 +02:00
parent 109e8990b8
commit d1c620f998
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/sfloader/fluid_defsfont.c
View file

@ -355,7 +355,7 @@ int fluid_defsfont_load(fluid_defsfont_t* sfont, const fluid_file_callbacks_t* f
/* Create all the sample headers */ /* Create all the sample headers */
p = sfdata->sample; p = sfdata->sample;
while (p != NULL) { while (p != NULL) {
sfsample = (SFSample *) p->data; sfsample = (SFSample *)fluid_list_get(p);
sample = new_fluid_sample(); sample = new_fluid_sample();
if (sample == NULL) goto err_exit; if (sample == NULL) goto err_exit;
@ -374,7 +374,7 @@ int fluid_defsfont_load(fluid_defsfont_t* sfont, const fluid_file_callbacks_t* f
/* Load all the presets */ /* Load all the presets */
p = sfdata->preset; p = sfdata->preset;
while (p != NULL) { while (p != NULL) {
sfpreset = (SFPreset *) p->data; sfpreset = (SFPreset *)fluid_list_get(p);
preset = new_fluid_defpreset(sfont); preset = new_fluid_defpreset(sfont);
if (preset == NULL) goto err_exit; if (preset == NULL) goto err_exit;
@ -832,7 +832,7 @@ fluid_defpreset_import_sfont(fluid_defpreset_t* preset,
p = sfpreset->zone; p = sfpreset->zone;
count = 0; count = 0;
while (p != NULL) { while (p != NULL) {
sfzone = (SFZone *) p->data; sfzone = (SFZone *)fluid_list_get(p);
FLUID_SNPRINTF(zone_name, sizeof(zone_name), "%s/%d", preset->name, count); FLUID_SNPRINTF(zone_name, sizeof(zone_name), "%s/%d", preset->name, count);
zone = new_fluid_preset_zone(zone_name); zone = new_fluid_preset_zone(zone_name);
if (zone == NULL) { if (zone == NULL) {
@ -968,7 +968,7 @@ fluid_preset_zone_import_sfont(fluid_preset_zone_t* zone, SFZone *sfzone, fluid_
SFGen* sfgen; SFGen* sfgen;
int count; int count;
for (count = 0, r = sfzone->gen; r != NULL; count++) { for (count = 0, r = sfzone->gen; r != NULL; count++) {
sfgen = (SFGen *) r->data; sfgen = (SFGen *)fluid_list_get(r);
switch (sfgen->id) { switch (sfgen->id) {
case GEN_KEYRANGE: case GEN_KEYRANGE:
zone->range.keylo = sfgen->amount.range.lo; zone->range.keylo = sfgen->amount.range.lo;
@ -1007,7 +1007,7 @@ fluid_preset_zone_import_sfont(fluid_preset_zone_t* zone, SFZone *sfzone, fluid_
/* Import the modulators (only SF2.1 and higher) */ /* Import the modulators (only SF2.1 and higher) */
for (count = 0, r = sfzone->mod; r != NULL; count++) { for (count = 0, r = sfzone->mod; r != NULL; count++) {
SFMod* mod_src = (SFMod *)r->data; SFMod* mod_src = (SFMod *)fluid_list_get(r);
fluid_mod_t * mod_dest = new_fluid_mod(); fluid_mod_t * mod_dest = new_fluid_mod();
int type; int type;
@ -1224,7 +1224,7 @@ fluid_inst_import_sfont(fluid_preset_zone_t* zonePZ, fluid_inst_t* inst,
count = 0; count = 0;
while (p != NULL) { while (p != NULL) {
sfzone = (SFZone *) p->data; sfzone = (SFZone *)fluid_list_get(p);
FLUID_SNPRINTF(zone_name, sizeof(zone_name), "%s/%d", inst->name, count); FLUID_SNPRINTF(zone_name, sizeof(zone_name), "%s/%d", inst->name, count);
zone = new_fluid_inst_zone(zone_name); zone = new_fluid_inst_zone(zone_name);
@ -1364,7 +1364,7 @@ fluid_inst_zone_import_sfont(fluid_preset_zone_t* preset_zone, fluid_inst_zone_t
int count; int count;
for (count = 0, r = sfzone->gen; r != NULL; count++) { for (count = 0, r = sfzone->gen; r != NULL; count++) {
sfgen = (SFGen *) r->data; sfgen = (SFGen *)fluid_list_get(r);
switch (sfgen->id) { switch (sfgen->id) {
case GEN_KEYRANGE: case GEN_KEYRANGE:
zone->range.keylo = sfgen->amount.range.lo; zone->range.keylo = sfgen->amount.range.lo;
@ -1408,7 +1408,7 @@ fluid_inst_zone_import_sfont(fluid_preset_zone_t* preset_zone, fluid_inst_zone_t
/* Import the modulators (only SF2.1 and higher) */ /* Import the modulators (only SF2.1 and higher) */
for (count = 0, r = sfzone->mod; r != NULL; count++) { for (count = 0, r = sfzone->mod; r != NULL; count++) {
SFMod* mod_src = (SFMod *) r->data; SFMod* mod_src = (SFMod *)fluid_list_get(r);
int type; int type;
fluid_mod_t* mod_dest; fluid_mod_t* mod_dest;