fix tie playback over measure boundaries

AaronDavidNewman · Dec 19, 2023 · 77bc22e · 77bc22e
1 parent beb9920
commit 77bc22e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/release/smoosic.js b/release/smoosic.js
@@ -5169,7 +5169,7 @@ class SuiAudioPlayer {
                     selector.tick = tickIx;
                     let ties = [];
                     const tieIx = '' + staffIx + '-' + measureIndex + '-' + voiceIx;
-                    let tiedNote = false;
+                    const prevMeasureIx = '' + staffIx + '-' + (measureIndex - 1) + '-' + voiceIx;
                     if (smoNote.noteType === 'n' && !smoNote.isHidden()) {
                         ties = staff.getTiesStartingAt(selector);
                         smoNote.pitches.forEach((pitch, pitchIx) => {
@@ -5209,7 +5209,13 @@ class SuiAudioPlayer {
                             measureNotes[curTick].push(soundData);
                         };
                         // If this is continuation of tied note, just change duration
-                        if (this.openTies[tieIx]) {
+                        if (this.openTies[prevMeasureIx]) {
+                            this.openTies[prevMeasureIx].duration += duration;
+                            if (ties.length === 0) {
+                                this.openTies[prevMeasureIx] = null;
+                            }
+                        }
+                        else if (this.openTies[tieIx]) {
                             this.openTies[tieIx].duration += duration;
                             if (ties.length === 0) {
                                 this.openTies[tieIx] = null;

diff --git a/release/smoosic.js.map b/release/smoosic.js.map
diff --git a/src/render/audio/player.ts b/src/render/audio/player.ts
@@ -189,7 +189,7 @@ export class SuiAudioPlayer {
           selector.tick = tickIx;
           let ties: SmoTie[] = [];
           const tieIx = '' + staffIx + '-' + measureIndex + '-' + voiceIx;
-          let tiedNote = false;
+          const prevMeasureIx = '' + staffIx + '-' + (measureIndex - 1) + '-' + voiceIx;
           if (smoNote.noteType === 'n' && !smoNote.isHidden()) {
             ties = staff.getTiesStartingAt(selector);
             smoNote.pitches.forEach((pitch, pitchIx) => {
@@ -228,7 +228,13 @@ export class SuiAudioPlayer {
               measureNotes[curTick].push(soundData);
             }
             // If this is continuation of tied note, just change duration
-            if (this.openTies[tieIx]) {
+            if (this.openTies[prevMeasureIx]) {
+              this.openTies[prevMeasureIx]!.duration += duration;
+              if (ties.length === 0) {
+                this.openTies[prevMeasureIx] = null;
+              }
+            }
+            else if (this.openTies[tieIx]) {
               this.openTies[tieIx]!.duration += duration;
               if (ties.length === 0) {
                 this.openTies[tieIx] = null;