From cc3d93b56e31b158886f5ed2150d46524ada704a Mon Sep 17 00:00:00 2001 From: jjceresa Date: Thu, 3 Jan 2019 19:40:55 +0100 Subject: [PATCH] Change on prefixe zone name -Name of an instrument zone shouldn't prefixed by the preset zone name. This is due to the fact that instrument zone are common to all preset zone. Consequently, an instrument zone cannot identfied via a preset zone. -This new change, simply prefixe a zone as this: instrument zone name prefixed by iz: preset zone name prefixed by pz: --- src/sfloader/fluid_defsfont.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/sfloader/fluid_defsfont.c b/src/sfloader/fluid_defsfont.c index d7960cbb..2e1634bb 100644 --- a/src/sfloader/fluid_defsfont.c +++ b/src/sfloader/fluid_defsfont.c @@ -1015,7 +1015,7 @@ fluid_defpreset_import_sfont(fluid_defpreset_t *defpreset, while(p != NULL) { sfzone = (SFZone *)fluid_list_get(p); - FLUID_SNPRINTF(zone_name, sizeof(zone_name), "%s/%d", defpreset->name, count); + FLUID_SNPRINTF(zone_name, sizeof(zone_name), "pz:%s/%d", defpreset->name, count); zone = new_fluid_preset_zone(zone_name); if(zone == NULL) @@ -1733,9 +1733,8 @@ fluid_inst_import_sfont(fluid_preset_zone_t *preset_zone, SFInst *sfinst, fluid_ { sfzone = (SFZone *)fluid_list_get(p); - /* integrates preset zone name in instrument zone name */ - FLUID_SNPRINTF(zone_name, sizeof(zone_name), "%s/%s/%d", preset_zone->name, - inst->name, count); + /* instrument zone name */ + FLUID_SNPRINTF(zone_name, sizeof(zone_name), "iz:%s/%d", inst->name, count); inst_zone = new_fluid_inst_zone(zone_name);