sf2-json 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sf2-json",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "SF2 to JSON Converter for WebAudioFonts",
   "keywords": [
     "sf2",

package/src/sf2-json.js

@@ -147,24 +147,6 @@ function buildWavBuffer(audioData) {
 	else throw new Error(`buildWavBuffer: type '${type}' non supporté (SF3 compressé).`);
 	pcm16 = normalizeBuffer(pcm16);
 
-	// const loopLen = loopEnd - loopStart;
-	// const MIN_LOOP_SAMPLES = Math.ceil(2 * 1152 * sampleRate / RESAMPLE_RATE);
-	// if (loopLen > 0 && loopLen < MIN_LOOP_SAMPLES) {
-	// 	const preLoop = pcm16.slice(0, loopStart * 2);
-	// 	const loopData = pcm16.slice(loopStart * 2, loopEnd * 2);
-	// 	const postLoop = pcm16.slice(loopEnd * 2);
-	// 	const repeats = Math.ceil(MIN_LOOP_SAMPLES / loopLen);
-	// 	const loopRepeated = Buffer.concat(Array(repeats).fill(loopData));
-	// 	pcm16 = Buffer.concat([preLoop, loopRepeated, postLoop]);
-	// }
-
-	// const minSamples = Math.ceil(4 * 1152 * sampleRate / RESAMPLE_RATE);
-	// const minBytes = minSamples * 2;
-	// if (pcm16.byteLength < minBytes) {
-	// 	const pad = Buffer.alloc(minBytes - pcm16.byteLength);
-	// 	pcm16 = Buffer.concat([pcm16, pad]);
-	// }
-
 	const numChannels = 1;
 	const bitsPerSample = 16;
 	const byteRate = sampleRate * numChannels * (bitsPerSample / 8);
@@ -192,16 +174,12 @@ function buildWavBuffer(audioData) {
 
 function extractZones(soundFont, parsed, presetHeaderIndex) {
 	const presetGeneratorsList = soundFont.getPresetGenerators(presetHeaderIndex);
-	const zones = [];
-	const seenSampleIds = new Set();
+	const zonesMap = new Map();
 	let globalPresetGen = null;
 
 	for (const rawGenList of presetGeneratorsList) {
 		const presetGen = createPresetGeneratorObject(rawGenList);
-		if (presetGen.instrument === undefined) {
-			globalPresetGen = presetGen;
-			continue;
-		}
+		if (presetGen.instrument === undefined) { globalPresetGen = presetGen; continue; }
 
 		const instrId = presetGen.instrument;
 		const instrGeneratorsList = soundFont.getInstrumentGenerators(instrId);
@@ -215,42 +193,30 @@ function extractZones(soundFont, parsed, presetHeaderIndex) {
 			const merged = { ...defaults };
 			if (globalInstrGen) Object.assign(merged, globalInstrGen);
 			Object.assign(merged, instrGen);
+
 			const applyPresetOffsets = (gen) => {
 				if (!gen) return;
 				for (const [key, val] of Object.entries(gen)) {
-					if (key === 'keyRange' || key === 'velRange' || key === 'instrument') continue;
+					if (['keyRange', 'velRange', 'instrument', 'sampleID'].includes(key)) continue;
 					if (key in merged && typeof val === 'number') merged[key] += val;
 				}
 			};
 			applyPresetOffsets(globalPresetGen);
 			applyPresetOffsets(presetGen);
 
-			const sampleId = merged.sampleID;
-			if (seenSampleIds.has(sampleId)) continue;
-			const sampleHeader = parsed.sampleHeaders[sampleId];
+			const lo = merged.keyRange?.lo ?? 0;
+			const hi = merged.keyRange?.hi ?? 127;
+			const keyRangeStr = `${lo}-${hi}`;
+			
+			const sampleHeader = parsed.sampleHeaders[merged.sampleID];
 			if (!sampleHeader || sampleHeader.isEnd) continue;
-			seenSampleIds.add(sampleId);
-			zones.push({ generators: merged, sampleHeader, sample: parsed.samples[sampleId] });
+
+			if (!zonesMap.has(keyRangeStr)) {
+				zonesMap.set(keyRangeStr, { generators: merged, sampleHeader, sample: parsed.samples[merged.sampleID] });
+			}
 		}
 	}
-	return zones;
-
-	// const byKeyRange = new Map();
-	// for (const zone of zones) {
-	// 	const lo = zone.generators.keyRange?.lo ?? 0;
-	// 	const hi = zone.generators.keyRange?.hi ?? 127;
-	// 	const key = `${lo}-${hi}`;
-	// 	if (!byKeyRange.has(key)) {
-	// 		byKeyRange.set(key, zone);
-	// 	} else {
-	// 		const center = (lo + hi) / 2;
-	// 		const existing = byKeyRange.get(key);
-	// 		const existingDist = Math.abs(existing.sampleHeader.originalPitch - center);
-	// 		const newDist = Math.abs(zone.sampleHeader.originalPitch - center);
-	// 		if (newDist < existingDist) byKeyRange.set(key, zone);
-	// 	}
-	// }
-	// return Array.from(byKeyRange.values());
+	return Array.from(zonesMap.values());
 }