audio-mixer-engine 1.3.7 → 1.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audio-mixer-engine",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "Audio engine library for audio mixer applications with MIDI parsing, playback, and synthesis",
   "main": "dist/audio-mixer-engine.cjs.js",
   "module": "dist/audio-mixer-engine.es.js",

package/src/lib/musicxml-converter.js

@@ -147,30 +147,51 @@ class MusicXmlConverter {
           }
         }
       }
-      // Check for tempo and swing in directions
-      const directions = getChildren(m, 'direction');
-      for (const dir of directions) {
-        const sound = getChild(dir, 'sound');
-        if (sound) {
-          const tempo = parseFloat(sound.getAttribute('tempo'));
-          if (!isNaN(tempo) && tempo > 0) cache.tempo = tempo;
-
-          // Detect <swing> element
-          const swingEl = getChild(sound, 'swing');
-          if (swingEl) {
-            if (getChild(swingEl, 'straight')) {
-              cache.swing = { straight: true };
-            } else {
-              const first = getChildNumber(swingEl, 'first');
-              const second = getChildNumber(swingEl, 'second');
-              const swingType = getChildText(swingEl, 'swing-type') || 'eighth';
-              if (first !== null && second !== null && first > 0 && second > 0) {
-                cache.swing = { first, second, swingType };
+      // Walk children in order to collect position-aware tempo/swing changes.
+      // Tracking divCursor lets us record each tempo change's beat-level offset
+      // within the measure, so mid-measure rit/accel steps land at the right tick.
+      let divCursor = 0;
+      cache.tempos = []; // [{ divisionOffset, tempo }]
+      for (const child of m.children) {
+        if (child.tagName === 'note') {
+          if (child.querySelector('chord') === null) {
+            const durEl = child.querySelector('duration');
+            divCursor += durEl ? parseInt(durEl.textContent, 10) || 0 : 0;
+          }
+        } else if (child.tagName === 'forward') {
+          const durEl = child.querySelector('duration');
+          divCursor += durEl ? parseInt(durEl.textContent, 10) || 0 : 0;
+        } else if (child.tagName === 'backup') {
+          const durEl = child.querySelector('duration');
+          divCursor -= durEl ? parseInt(durEl.textContent, 10) || 0 : 0;
+          if (divCursor < 0) divCursor = 0;
+        } else if (child.tagName === 'direction') {
+          const sound = getChild(child, 'sound');
+          if (sound) {
+            const tempo = parseFloat(sound.getAttribute('tempo'));
+            if (!isNaN(tempo) && tempo > 0) {
+              cache.tempos.push({ divisionOffset: divCursor, tempo });
+            }
+
+            // Detect <swing> element
+            const swingEl = getChild(sound, 'swing');
+            if (swingEl) {
+              if (getChild(swingEl, 'straight')) {
+                cache.swing = { straight: true };
+              } else {
+                const first = getChildNumber(swingEl, 'first');
+                const second = getChildNumber(swingEl, 'second');
+                const swingType = getChildText(swingEl, 'swing-type') || 'eighth';
+                if (first !== null && second !== null && first > 0 && second > 0) {
+                  cache.swing = { first, second, swingType };
+                }
               }
             }
           }
         }
       }
+      // Keep cache.tempo for structure-display purposes (first tempo seen in measure)
+      if (cache.tempos.length > 0) cache.tempo = cache.tempos[0].tempo;
       measureTimingCache.set(mi, cache);
     }
 
@@ -187,6 +208,10 @@ class MusicXmlConverter {
       const mi = entry.measureIndex;
       const cachedTiming = measureTimingCache.get(mi) || {};
 
+      // Read measure start before mutating the timing cursor for tempo placement
+      const measureStartTick = timingEngine.currentTick;
+      const actualBeats = entry.beatsInMeasure;
+
       // Apply timing state for this measure
       if (cachedTiming.divisions) {
         timingEngine.currentDivisions = cachedTiming.divisions;
@@ -194,17 +219,22 @@ class MusicXmlConverter {
       if (cachedTiming.timeSig) {
         timingEngine.currentTimeSig = { ...cachedTiming.timeSig };
       }
-      if (cachedTiming.tempo) {
-        timingEngine.processTempo(cachedTiming.tempo);
+
+      // Apply each tempo change at its exact tick offset within the measure so that
+      // mid-measure rit/accel steps (e.g. one change per beat) are preserved.
+      if (cachedTiming.tempos && cachedTiming.tempos.length > 0) {
+        const divisions = cachedTiming.divisions || timingEngine.currentDivisions;
+        for (const { divisionOffset, tempo } of cachedTiming.tempos) {
+          const tickOffset = Math.round((divisionOffset / divisions) * timingEngine.ticksPerBeat);
+          timingEngine.currentTick = measureStartTick + tickOffset;
+          timingEngine.processTempo(tempo);
+        }
+        timingEngine.currentTick = measureStartTick; // Restore cursor for bar-structure generation
       }
+
       if (cachedTiming.swing) {
         timingEngine.processSwing(cachedTiming.swing);
       }
-
-      // Generate barStructure entry at current tick position
-      // Use actual beats from unrolled entry (handles partial bars)
-      const measureStartTick = timingEngine.currentTick;
-      const actualBeats = entry.beatsInMeasure;
       const barEntry = timingEngine.generateBarStructureEntry(measureStartTick, actualBeats);
       barStructure.push(barEntry);