zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-11 05:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename pr in load_ihdr to prev_inst

Browse source
This commit is contained in:
Marcus Weseloh 2021-03-14 21:29:28 +01:00
parent c545766ea6
commit 93a74ff3bd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sfloader/fluid_sffile.c
View file

@ -1592,7 +1592,7 @@ static int load_ihdr(SFData *sf, unsigned int size)
{ {
unsigned int i; unsigned int i;
int i2; int i2;
SFInst *inst, *pr = NULL; /* ptr to current & previous instrument */ SFInst *inst, *prev_inst = NULL; /* ptr to current & previous instrument */
unsigned short zndx, pzndx = 0; unsigned short zndx, pzndx = 0;
if(size % SF_IHDR_SIZE || size == 0) /* chunk size is valid? */ if(size % SF_IHDR_SIZE || size == 0) /* chunk size is valid? */
@ -1626,7 +1626,7 @@ static int load_ihdr(SFData *sf, unsigned int size)
READSTR(sf, &inst->name); /* Possible read failure ^ */ READSTR(sf, &inst->name); /* Possible read failure ^ */
READW(sf, zndx); READW(sf, zndx);
if(pr) if(prev_inst)
{ {
/* not first instrument? */ /* not first instrument? */
if(zndx < pzndx) if(zndx < pzndx)
@ -1639,7 +1639,7 @@ static int load_ihdr(SFData *sf, unsigned int size)
while(i2--) while(i2--)
{ {
pr->zone = fluid_list_prepend(pr->zone, NULL); prev_inst->zone = fluid_list_prepend(prev_inst->zone, NULL);
} }
} }
else if(zndx > 0) /* 1st inst, warn if ofs >0 */ else if(zndx > 0) /* 1st inst, warn if ofs >0 */
@ -1648,7 +1648,7 @@ static int load_ihdr(SFData *sf, unsigned int size)
} }
pzndx = zndx; pzndx = zndx;
pr = inst; /* update instrument ptr */ prev_inst = inst; /* update instrument ptr */
} }
FSKIP(sf, 20); FSKIP(sf, 20);
@ -1664,7 +1664,7 @@ static int load_ihdr(SFData *sf, unsigned int size)
while(i2--) while(i2--)
{ {
pr->zone = fluid_list_prepend(pr->zone, NULL); prev_inst->zone = fluid_list_prepend(prev_inst->zone, NULL);
} }
return TRUE; return TRUE;