@onjmin/dtm 2.1.1 → 2.1.2

package/dist/index.js

@@ -19687,6 +19687,7 @@ var mountDAW = (target, options = {}) => {
       redrawAll();
     },
     onEnd: (interrupted) => {
+      options.onScheduleFade?.(null);
       if (interrupted) {
         playbackState = "paused";
         pausedPlayStep = currentPlayStep;
@@ -19778,15 +19779,20 @@ var mountDAW = (target, options = {}) => {
       }
       if (fadeOutSec > 0) {
         const endStep = getSongEndStepExact();
-        const totalDurationSec = (endStep - fromStep) * secondsPerStepFade;
-        if (totalDurationSec > 0) {
-          const fadeOutEndAt = anchor + totalDurationSec;
-          const earliestStart = params.fadeInEndAt ?? anchor;
-          params.fadeOutEndAt = fadeOutEndAt;
-          params.fadeOutStartAt = Math.max(
-            fadeOutEndAt - fadeOutSec,
-            earliestStart
-          );
+        if (endStep > fromStep) {
+          const totalDurationSec = (endStep - fromStep) * secondsPerStepFade;
+          if (totalDurationSec > 0.1) {
+            const fadeOutEndAt = anchor + totalDurationSec;
+            const earliestStart = params.fadeInEndAt ?? anchor;
+            const fadeOutStartAt = Math.max(
+              fadeOutEndAt - fadeOutSec,
+              earliestStart
+            );
+            if (fadeOutStartAt < fadeOutEndAt) {
+              params.fadeOutStartAt = fadeOutStartAt;
+              params.fadeOutEndAt = fadeOutEndAt;
+            }
+          }
         }
       }
       options.onScheduleFade?.(params);
@@ -24235,6 +24241,8 @@ var createDtmStudio = async (options = {}) => {
     };
   };
   const resumeAudio = () => {
+    fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
+    fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
   };
@@ -25078,9 +25086,7 @@ var createDtmStudio = async (options = {}) => {
     if (!sfInst) return;
     const vol = options2.volume ?? 80;
     const dur = options2.duration ?? 1;
-    if (audioCtx.state === "suspended") {
-      await audioCtx.resume();
-    }
+    await resumeAudio();
     const { midi, detuneCents } = unitsToMidiDetune(options2.pitchUnits);
     sfInst.play({
       ctx: audioCtx,

package/dist/index.mjs

@@ -19505,6 +19505,7 @@ var mountDAW = (target, options = {}) => {
       redrawAll();
     },
     onEnd: (interrupted) => {
+      options.onScheduleFade?.(null);
       if (interrupted) {
         playbackState = "paused";
         pausedPlayStep = currentPlayStep;
@@ -19596,15 +19597,20 @@ var mountDAW = (target, options = {}) => {
       }
       if (fadeOutSec > 0) {
         const endStep = getSongEndStepExact();
-        const totalDurationSec = (endStep - fromStep) * secondsPerStepFade;
-        if (totalDurationSec > 0) {
-          const fadeOutEndAt = anchor + totalDurationSec;
-          const earliestStart = params.fadeInEndAt ?? anchor;
-          params.fadeOutEndAt = fadeOutEndAt;
-          params.fadeOutStartAt = Math.max(
-            fadeOutEndAt - fadeOutSec,
-            earliestStart
-          );
+        if (endStep > fromStep) {
+          const totalDurationSec = (endStep - fromStep) * secondsPerStepFade;
+          if (totalDurationSec > 0.1) {
+            const fadeOutEndAt = anchor + totalDurationSec;
+            const earliestStart = params.fadeInEndAt ?? anchor;
+            const fadeOutStartAt = Math.max(
+              fadeOutEndAt - fadeOutSec,
+              earliestStart
+            );
+            if (fadeOutStartAt < fadeOutEndAt) {
+              params.fadeOutStartAt = fadeOutStartAt;
+              params.fadeOutEndAt = fadeOutEndAt;
+            }
+          }
         }
       }
       options.onScheduleFade?.(params);
@@ -24052,6 +24058,8 @@ var createDtmStudio = async (options = {}) => {
     };
   };
   const resumeAudio = () => {
+    fadeGain.gain.cancelScheduledValues(audioCtx.currentTime);
+    fadeGain.gain.setValueAtTime(1, audioCtx.currentTime);
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
   };
@@ -24895,9 +24903,7 @@ var createDtmStudio = async (options = {}) => {
     if (!sfInst) return;
     const vol = options2.volume ?? 80;
     const dur = options2.duration ?? 1;
-    if (audioCtx.state === "suspended") {
-      await audioCtx.resume();
-    }
+    await resumeAudio();
     const { midi, detuneCents } = unitsToMidiDetune(options2.pitchUnits);
     sfInst.play({
       ctx: audioCtx,

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {