From 16d2f43509e237cd458d31bf590b982dcfaa6d57 Mon Sep 17 00:00:00 2001 From: Marcus Weseloh Date: Thu, 25 Mar 2021 21:22:10 +0100 Subject: [PATCH] Remove unused library, genre and morphology fields Those fields are not used anywhere, so let's simply remove them. --- src/sfloader/fluid_sffile.c | 6 +++--- src/sfloader/fluid_sffile.h | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/sfloader/fluid_sffile.c b/src/sfloader/fluid_sffile.c index a4b05569..6f4bf797 100644 --- a/src/sfloader/fluid_sffile.c +++ b/src/sfloader/fluid_sffile.c @@ -1094,9 +1094,9 @@ static int load_phdr(SFData *sf, unsigned int size) READW(sf, preset->prenum); READW(sf, preset->bank); READW(sf, pbag_idx); - READD(sf, preset->libr); - READD(sf, preset->genre); - READD(sf, preset->morph); + FSKIP(sf, 4); /* library ignored */ + FSKIP(sf, 4); /* genre ignored */ + FSKIP(sf, 4); /* morphology ignored */ if(prev_preset) { diff --git a/src/sfloader/fluid_sffile.h b/src/sfloader/fluid_sffile.h index 8dc53c79..0f03ac08 100644 --- a/src/sfloader/fluid_sffile.h +++ b/src/sfloader/fluid_sffile.h @@ -130,9 +130,6 @@ struct _SFPreset char name[21]; /* preset name */ unsigned short prenum; /* preset number */ unsigned short bank; /* bank number */ - unsigned int libr; /* Not used (preserved) */ - unsigned int genre; /* Not used (preserved) */ - unsigned int morph; /* Not used (preserved) */ fluid_list_t *zone; /* list of preset zones */ }; @@ -189,9 +186,6 @@ struct _SFPhdr unsigned short preset; /* preset number */ unsigned short bank; /* bank number */ unsigned short pbagndx; /* index into preset bag */ - unsigned int library; /* just for preserving them */ - unsigned int genre; /* Not used */ - unsigned int morphology; /* Not used */ }; struct _SFBag