mirror of
https://github.com/ZDoom/ZMusic.git
synced 2025-03-20 01:21:03 +00:00
- timidity++: better handling of soundfont terminal preset record
This commit is contained in:
parent
e8b2bd4318
commit
9d7175259e
1 changed files with 3 additions and 2 deletions
5
thirdparty/timidityplus/sndfont.cpp
vendored
5
thirdparty/timidityplus/sndfont.cpp
vendored
|
@ -267,7 +267,8 @@ void Instruments::init_sf(SFInsts *rec)
|
|||
return;
|
||||
}
|
||||
|
||||
if(load_soundfont(&sfinfo, rec->tf))
|
||||
// SoundFont spec, 7.2: ... contains a minimum of two records, one record for each preset and one for a terminal record
|
||||
if(load_soundfont(&sfinfo, rec->tf) || sfinfo.npresets < 2)
|
||||
{
|
||||
end_soundfont(rec);
|
||||
return;
|
||||
|
@ -275,7 +276,7 @@ void Instruments::init_sf(SFInsts *rec)
|
|||
|
||||
correct_samples(&sfinfo);
|
||||
current_sfrec = rec;
|
||||
for (i = 0; i < sfinfo.npresets; i++) {
|
||||
for (i = 0; i < sfinfo.npresets - 1; i++) {
|
||||
int bank = sfinfo.preset[i].bank;
|
||||
int preset = sfinfo.preset[i].preset;
|
||||
|
||||
|
|
Loading…
Reference in a new issue