@onjmin/dtm 0.1.59 → 0.1.61

package/dist/index.d.mts

@@ -406,6 +406,13 @@ type SingingVoices = {
     stopStream: () => void;
     /** ストリーム停止＋各モデルの内部状態を初期化する。 */
     reset: () => void;
+    /**
+     * マスタ音量（0〜1のゲイン）をリアルタイムに反映する。
+     * 発音時にゲインを焼き込む方式だと再生中の音量変更が既にスケジュール済み・
+     * ストリーミング中の音符に効かないため、全モデル共通の GainNode を介して
+     * 常時ライブ反映できるようにする。
+     */
+    setVolume: (gain: number) => void;
 };
 /** {@link SingingVoices.warm} の既定先合成数（各トラック先頭からの音数）。 */
 declare const PREWARM_NOTES = 3;

package/dist/index.d.ts

@@ -406,6 +406,13 @@ type SingingVoices = {
     stopStream: () => void;
     /** ストリーム停止＋各モデルの内部状態を初期化する。 */
     reset: () => void;
+    /**
+     * マスタ音量（0〜1のゲイン）をリアルタイムに反映する。
+     * 発音時にゲインを焼き込む方式だと再生中の音量変更が既にスケジュール済み・
+     * ストリーミング中の音符に効かないため、全モデル共通の GainNode を介して
+     * 常時ライブ反映できるようにする。
+     */
+    setVolume: (gain: number) => void;
 };
 /** {@link SingingVoices.warm} の既定先合成数（各トラック先頭からの音数）。 */
 declare const PREWARM_NOTES = 3;

package/dist/index.js

@@ -2676,8 +2676,10 @@ var createSingingVoices = (ctx, destination, options = {}) => {
   for (const [k, v] of Object.entries(options.voicebanks ?? {}))
     catalog[k.toLowerCase()] = v;
   let streamSession = 0;
+  const masterGain = ctx.createGain();
+  masterGain.connect(destination);
   const loaded = /* @__PURE__ */ new Map([
-    [FALLBACK_MODEL, createKlattVoice(ctx, destination)]
+    [FALLBACK_MODEL, createKlattVoice(ctx, masterGain)]
   ]);
   const loading = /* @__PURE__ */ new Map();
   const load2 = (model) => {
@@ -2693,7 +2695,7 @@ var createSingingVoices = (ctx, destination, options = {}) => {
       // マニフェストだけ先読みし、音素PCMは歌う直前にオンデマンド取得する
       // （= 初回に .koe 全体をDLしない。モバイル初回ロードの待ちを解消）。
       // Blob/File が直接渡されたケース（ローカル読み込み）はそのまま BlobVoiceSource。
-      createKoeVoice(ctx, destination, {
+      createKoeVoice(ctx, masterGain, {
         koe,
         worldlineScriptUrl: options.worldlineScriptUrl,
         lightweight: options.lightweight,
@@ -2830,13 +2832,17 @@ var createSingingVoices = (ctx, destination, options = {}) => {
     stopStream();
     for (const v of loaded.values()) v.reset?.();
   };
+  const setVolume = (gain) => {
+    masterGain.gain.value = Math.max(0, gain);
+  };
   return {
     loadModels,
     registerVoicebanks,
     warm,
     startStream,
     stopStream,
-    reset
+    reset,
+    setVolume
   };
 };
 var createVoiceRegistry = (models = {}, fallback = "klatt") => {
@@ -5605,6 +5611,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     if (!voices) {
       const ctx = ensureCtx();
       voices = createSingingVoices(ctx, ctx.destination);
+      voices.setVolume(masterVolume / 100);
     }
     return voices;
   };
@@ -6350,6 +6357,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   };
   const setVolume = (volume) => {
     masterVolume = volume;
+    peekVoices()?.setVolume(masterVolume / 100);
   };
   const buildStreamTracks = () => [...lyricTracks.entries()].map(([index, lt]) => {
     const seqTrack = seqTracks.find((t) => Number(t.id) === index);
@@ -6372,7 +6380,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     return {
       id: String(index),
       model: lt.model,
-      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100) * (masterVolume / 100),
+      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
       notes
     };
@@ -6606,7 +6614,7 @@ var findZone = (ctx, fontName, zones, pitchs = []) => {
   for (let i = zones.length - 1; i >= 0; i--)
     for (const v of set) {
       const zone = zones[i];
-      if (v < zone.keyRangeLow || v > zone.keyRangeHigh + 1) continue;
+      if (v < zone.keyRangeLow || v > zone.keyRangeHigh) continue;
       set.delete(v);
       map.set(v, { ...zone });
     }
@@ -6704,7 +6712,7 @@ var adjustZone = async (ctx, fontName, zone) => {
             const oldData = oldBuf.getChannelData(ch);
             const newData = newBuf.getChannelData(ch);
             for (let i = 0; i < attackLength; i++) {
-              const ratio = attackLength > 0 ? i / attackLength : 0;
+              const ratio = attackLength > 1 ? i / (attackLength - 1) : 0;
               const m = 1 + (gainMultiplier - 1) * ratio;
               newData[i] = oldData[i] * m;
             }
@@ -9029,6 +9037,7 @@ var init = (mountTarget, width = 800, height = 450, config) => {
   gridCanvas.style.left = `${KEYBOARD_WIDTH}px`;
   gridCanvas.style.top = `${HEADER_HEIGHT}px`;
   gridCanvas.style.touchAction = "none";
+  gridCanvas.style.userSelect = "none";
   const gridCtx = gridCanvas.getContext("2d", { willReadFrequently: true });
   if (!gridCtx) throw new Error("Failed to get 2D rendering context for grid.");
   g_grid_ctx = gridCtx;
@@ -10022,6 +10031,7 @@ var mountDAW = (target, options = {}) => {
   let zoomY = 100;
   let bpm = options.defaultBpm ?? DEFAULT_BPM;
   let masterVolume = options.masterVolume ?? 50;
+  options.singingVoices?.setVolume(masterVolume / 100);
   let drumVolume = options.drumVolume ?? 80;
   let currentDrumPattern = refs.drumSelect.value;
   let currentInstrument = "";
@@ -10899,7 +10909,7 @@ var mountDAW = (target, options = {}) => {
       return {
         id: trackState?.config.id,
         model: lt.model,
-        volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (masterVolume / 100),
+        volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME),
         pan: panToStereo(lt.pan ?? DEFAULT_PAN),
         notes
       };
@@ -11908,6 +11918,7 @@ var mountDAW = (target, options = {}) => {
     refs.masterVolume.addEventListener("input", () => {
       masterVolume = Number.parseInt(refs.masterVolume.value, 10) || 0;
       refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+      options.singingVoices?.setVolume(masterVolume / 100);
     });
     refs.drumSelect.addEventListener("change", () => {
       currentDrumPattern = refs.drumSelect.value;
@@ -12784,11 +12795,13 @@ var mountDAW = (target, options = {}) => {
       masterVolume = clamp3(volume, 0, 100);
       refs.masterVolume.value = String(masterVolume);
       refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+      options.singingVoices?.setVolume(masterVolume / 100);
     },
     setVolume: (volume) => {
       masterVolume = clamp3(volume, 0, 100);
       refs.masterVolume.value = String(masterVolume);
       refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+      options.singingVoices?.setVolume(masterVolume / 100);
     },
     setDrumVolume: (volume) => {
       drumVolume = clamp3(volume, 0, 100);

package/dist/index.mjs

@@ -2554,8 +2554,10 @@ var createSingingVoices = (ctx, destination, options = {}) => {
   for (const [k, v] of Object.entries(options.voicebanks ?? {}))
     catalog[k.toLowerCase()] = v;
   let streamSession = 0;
+  const masterGain = ctx.createGain();
+  masterGain.connect(destination);
   const loaded = /* @__PURE__ */ new Map([
-    [FALLBACK_MODEL, createKlattVoice(ctx, destination)]
+    [FALLBACK_MODEL, createKlattVoice(ctx, masterGain)]
   ]);
   const loading = /* @__PURE__ */ new Map();
   const load2 = (model) => {
@@ -2571,7 +2573,7 @@ var createSingingVoices = (ctx, destination, options = {}) => {
       // マニフェストだけ先読みし、音素PCMは歌う直前にオンデマンド取得する
       // （= 初回に .koe 全体をDLしない。モバイル初回ロードの待ちを解消）。
       // Blob/File が直接渡されたケース（ローカル読み込み）はそのまま BlobVoiceSource。
-      createKoeVoice(ctx, destination, {
+      createKoeVoice(ctx, masterGain, {
         koe,
         worldlineScriptUrl: options.worldlineScriptUrl,
         lightweight: options.lightweight,
@@ -2708,13 +2710,17 @@ var createSingingVoices = (ctx, destination, options = {}) => {
     stopStream();
     for (const v of loaded.values()) v.reset?.();
   };
+  const setVolume = (gain) => {
+    masterGain.gain.value = Math.max(0, gain);
+  };
   return {
     loadModels,
     registerVoicebanks,
     warm,
     startStream,
     stopStream,
-    reset
+    reset,
+    setVolume
   };
 };
 var createVoiceRegistry = (models = {}, fallback = "klatt") => {
@@ -5483,6 +5489,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     if (!voices) {
       const ctx = ensureCtx();
       voices = createSingingVoices(ctx, ctx.destination);
+      voices.setVolume(masterVolume / 100);
     }
     return voices;
   };
@@ -6228,6 +6235,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   };
   const setVolume = (volume) => {
     masterVolume = volume;
+    peekVoices()?.setVolume(masterVolume / 100);
   };
   const buildStreamTracks = () => [...lyricTracks.entries()].map(([index, lt]) => {
     const seqTrack = seqTracks.find((t) => Number(t.id) === index);
@@ -6250,7 +6258,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     return {
       id: String(index),
       model: lt.model,
-      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100) * (masterVolume / 100),
+      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
       notes
     };
@@ -6484,7 +6492,7 @@ var findZone = (ctx, fontName, zones, pitchs = []) => {
   for (let i = zones.length - 1; i >= 0; i--)
     for (const v of set) {
       const zone = zones[i];
-      if (v < zone.keyRangeLow || v > zone.keyRangeHigh + 1) continue;
+      if (v < zone.keyRangeLow || v > zone.keyRangeHigh) continue;
       set.delete(v);
       map.set(v, { ...zone });
     }
@@ -6582,7 +6590,7 @@ var adjustZone = async (ctx, fontName, zone) => {
             const oldData = oldBuf.getChannelData(ch);
             const newData = newBuf.getChannelData(ch);
             for (let i = 0; i < attackLength; i++) {
-              const ratio = attackLength > 0 ? i / attackLength : 0;
+              const ratio = attackLength > 1 ? i / (attackLength - 1) : 0;
               const m = 1 + (gainMultiplier - 1) * ratio;
               newData[i] = oldData[i] * m;
             }
@@ -8907,6 +8915,7 @@ var init = (mountTarget, width = 800, height = 450, config) => {
   gridCanvas.style.left = `${KEYBOARD_WIDTH}px`;
   gridCanvas.style.top = `${HEADER_HEIGHT}px`;
   gridCanvas.style.touchAction = "none";
+  gridCanvas.style.userSelect = "none";
   const gridCtx = gridCanvas.getContext("2d", { willReadFrequently: true });
   if (!gridCtx) throw new Error("Failed to get 2D rendering context for grid.");
   g_grid_ctx = gridCtx;
@@ -9900,6 +9909,7 @@ var mountDAW = (target, options = {}) => {
   let zoomY = 100;
   let bpm = options.defaultBpm ?? DEFAULT_BPM;
   let masterVolume = options.masterVolume ?? 50;
+  options.singingVoices?.setVolume(masterVolume / 100);
   let drumVolume = options.drumVolume ?? 80;
   let currentDrumPattern = refs.drumSelect.value;
   let currentInstrument = "";
@@ -10777,7 +10787,7 @@ var mountDAW = (target, options = {}) => {
       return {
         id: trackState?.config.id,
         model: lt.model,
-        volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (masterVolume / 100),
+        volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME),
         pan: panToStereo(lt.pan ?? DEFAULT_PAN),
         notes
       };
@@ -11786,6 +11796,7 @@ var mountDAW = (target, options = {}) => {
     refs.masterVolume.addEventListener("input", () => {
       masterVolume = Number.parseInt(refs.masterVolume.value, 10) || 0;
       refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+      options.singingVoices?.setVolume(masterVolume / 100);
     });
     refs.drumSelect.addEventListener("change", () => {
       currentDrumPattern = refs.drumSelect.value;
@@ -12662,11 +12673,13 @@ var mountDAW = (target, options = {}) => {
       masterVolume = clamp3(volume, 0, 100);
       refs.masterVolume.value = String(masterVolume);
       refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+      options.singingVoices?.setVolume(masterVolume / 100);
     },
     setVolume: (volume) => {
       masterVolume = clamp3(volume, 0, 100);
       refs.masterVolume.value = String(masterVolume);
       refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+      options.singingVoices?.setVolume(masterVolume / 100);
     },
     setDrumVolume: (volume) => {
       drumVolume = clamp3(volume, 0, 100);

package/package.json

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