@onjmin/dtm 1.0.2 → 1.0.4

package/dist/index.d.mts

@@ -2086,6 +2086,8 @@ type SoundFontInstance = {
         destination: AudioNode;
         pitch: number;
         volume: number;
+        /** 元ノートのvelocity(0-127)。音量ではなく音色の明るさにだけ効く。 */
+        velocity?: number;
         when: number;
         duration: number;
     }) => void;

package/dist/index.d.ts

@@ -2086,6 +2086,8 @@ type SoundFontInstance = {
         destination: AudioNode;
         pitch: number;
         volume: number;
+        /** 元ノートのvelocity(0-127)。音量ではなく音色の明るさにだけ効く。 */
+        velocity?: number;
         when: number;
         duration: number;
     }) => void;

package/dist/index.js

@@ -8850,8 +8850,8 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     ...normalizeDrumPatterns(options.drumPatterns ?? {})
   };
   const drumPatternName = meta.drum ?? "none";
-  const trackVolume = meta.volume ?? options.volume ?? 100;
-  let masterVolume = options.masterVolume ?? 50;
+  const trackVolume = options.volume ?? 100;
+  let masterVolume = meta.volume ?? options.masterVolume ?? 50;
   const drumVolume = meta.drumVolume ?? 80;
   const colors = options.trackColors ?? DEFAULT_TRACK_COLORS;
   const useSynth = options.synth ?? !options.onPlayNote;
@@ -9157,6 +9157,9 @@ var mountMmlPlayer = (target, mml, options = {}) => {
           singingVoices: options.singingVoices,
           drumPatterns: options.drumPatterns,
           volume: trackVolume,
+          // 解説モーダル内の試聴サンプルも親と同じマスタ音量で鳴らす
+          // （サンプル側のMMLに `#volume=` があればそちらが優先される）。
+          masterVolume,
           // 解説モーダル内の試聴サンプルは規約同意を要求しない。
           skipConsent: true,
           // 再帰的なモーダル生成を防ぐ。
@@ -9924,14 +9927,23 @@ var SoundFont = class _SoundFont {
   /** 発音ごとの音量微揺らぎ幅（比率、0.06 = ±6%の範囲で一様乱数）。 */
   static humanizeGainRatio = 0.06;
   // ── ベロシティ→明るさ連動フィルタ ──
-  // volume は音量にしか効かず音色（明るさ）が変わらないのを補うため、
-  // ローパスのカットオフを volume に連動させる（弱いほど丸く、強いほど明るく）。
-  /** volume=0 のときのローパスカットオフ(Hz)。 */
-  static brightnessMinHz = 1200;
-  /** volume=1 のときのローパスカットオフ(Hz)。サンプルの帯域を実質塞がない値。 */
-  static brightnessMaxHz = 18e3;
+  // velocity は音量にしか効かず音色（明るさ）が変わらないのを補うため、
+  // ローパスのカットオフを velocity に連動させる（弱いほど丸く、強いほど明るく）。
+  // 連動元は必ず velocity であって volume ではない。volume には
+  // 「トラック音量フェーダー×velocity」が既に畳み込まれている（sequencer.ts参照）ため、
+  // volume を使うとフェーダーを下げただけで音色まで暗くなり、音量がゲインと音色へ
+  // 二重に効いてしまう。音量フェーダーは音色を変えてはならない。
+  /** velocity=0 のときのローパスカットオフ(Hz)。 */
+  static brightnessMinHz = 2400;
+  /** velocity=127 のときのローパスカットオフ(Hz)。サンプルの帯域を実質塞がない値。 */
+  static brightnessMaxHz = 2e4;
   /** ベロシティ→明るさフィルタのQ値。共鳴が付かないButterworth特性。 */
   static brightnessQ = Math.SQRT1_2;
+  /**
+   * この明るさ比率以上ならフィルタ自体を挿入しない。最強ベロシティの音は改修前と
+   * 完全に同一の信号経路を通り、余計な音痩せや位相変化が起きないようにするため。
+   */
+  static brightnessBypassAbove = 0.98;
   // ── ロングトーン用ビブラート(ピッチLFO) ──
   // 伸ばす音が完全に静止していると不自然に聞こえるため、一定長以上持続する
   // 音符にだけ、発音直後フェードインしつつ穏やかなピッチ揺れを掛ける。
@@ -9986,6 +9998,7 @@ var SoundFont = class _SoundFont {
     destination,
     pitch = 60,
     volume = 1,
+    velocity,
     when = 0,
     duration = 1
   } = {}) {
@@ -9996,7 +10009,6 @@ var SoundFont = class _SoundFont {
     const zone = zones.get(pitch);
     if (!zone) return;
     const src = ctx.createBufferSource();
-    const filter = ctx.createBiquadFilter();
     const g = ctx.createGain();
     const _when = when + ctx.currentTime;
     const { buffer, _param } = zone;
@@ -10008,13 +10020,16 @@ var SoundFont = class _SoundFont {
     const humanizeGainMul = 1 + (Math.random() * 2 - 1) * _SoundFont.humanizeGainRatio;
     src.detune.setValueAtTime(humanizeCents, 0);
     const effectiveVolume = volume * humanizeGainMul;
-    filter.type = "lowpass";
-    const brightness = Math.max(0, Math.min(1, volume));
-    filter.frequency.setValueAtTime(
-      _SoundFont.brightnessMinHz + (_SoundFont.brightnessMaxHz - _SoundFont.brightnessMinHz) * brightness,
-      0
-    );
-    filter.Q.setValueAtTime(_SoundFont.brightnessQ, 0);
+    const brightness = velocity === void 0 ? 1 : Math.max(0, Math.min(1, velocity / 127));
+    const filter = brightness >= _SoundFont.brightnessBypassAbove ? void 0 : ctx.createBiquadFilter();
+    if (filter) {
+      filter.type = "lowpass";
+      filter.frequency.setValueAtTime(
+        _SoundFont.brightnessMinHz + (_SoundFont.brightnessMaxHz - _SoundFont.brightnessMinHz) * brightness,
+        0
+      );
+      filter.Q.setValueAtTime(_SoundFont.brightnessQ, 0);
+    }
     g.gain.setValueAtTime(0, ctx.currentTime);
     const attackTime = 5e-3;
     const startGainTime = Math.max(ctx.currentTime, _when);
@@ -10026,7 +10041,9 @@ var SoundFont = class _SoundFont {
       g.gain.setValueAtTime(effectiveVolume, startGainTime + attackTime);
       g.gain.linearRampToValueAtTime(0, end);
     }
-    src.connect(filter).connect(g).connect(destination);
+    if (filter) src.connect(filter).connect(g);
+    else src.connect(g);
+    g.connect(destination);
     let vibratoOsc;
     let vibratoDepth;
     if (!isDrum && duration >= _SoundFont.longToneThresholdSec) {
@@ -10047,7 +10064,7 @@ var SoundFont = class _SoundFont {
     src.stop(end);
     src.onended = () => {
       src.disconnect();
-      filter.disconnect();
+      filter?.disconnect();
       g.disconnect();
       vibratoOsc?.disconnect();
       vibratoDepth?.disconnect();
@@ -11141,6 +11158,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
   };
   const wafPlayDynamic = ({
     pitch,
+    velocity,
     volume,
     when,
     duration,
@@ -11154,6 +11172,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
         destination,
         pitch,
         volume: volume * 0.85,
+        velocity,
         when,
         duration
       });
@@ -19339,6 +19358,30 @@ var createDtmStudio = async (options = {}) => {
     }
     return strip;
   };
+  const createTrackStripApplier = (meta) => {
+    const applied = /* @__PURE__ */ new Set();
+    return (stripId, trackIdx) => {
+      if (applied.has(stripId)) return;
+      applied.add(stripId);
+      const strip = getChannelStrip(stripId);
+      const comp = meta.trackCompression?.[trackIdx];
+      if (comp !== void 0) strip.setCompression(comp);
+      const width = meta.trackWidth?.[trackIdx];
+      if (width !== void 0) strip.setWidth(width);
+      const eqLow = meta.trackEqLow?.[trackIdx];
+      if (eqLow !== void 0) strip.setEqLow(eqLow);
+      const eqMid = meta.trackEqMid?.[trackIdx];
+      if (eqMid !== void 0) strip.setEqMid(eqMid);
+      const eqHigh = meta.trackEqHigh?.[trackIdx];
+      if (eqHigh !== void 0) strip.setEqHigh(eqHigh);
+      const reverbSend = meta.trackReverbSend?.[trackIdx];
+      if (reverbSend !== void 0) strip.setReverbSend(reverbSend);
+      const delaySend = meta.trackDelaySend?.[trackIdx];
+      if (delaySend !== void 0) strip.setDelaySend(delaySend);
+      const pan = meta.trackPan?.[trackIdx];
+      if (pan !== void 0) strip.setPan(panToStereo(pan));
+    };
+  };
   const resumeAudio = () => {
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
@@ -19612,6 +19655,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -19905,8 +19949,10 @@ var createDtmStudio = async (options = {}) => {
       ),
       loadPlayerTrackInstruments()
     ]);
+    const applyTrackStrip = createTrackStripApplier(meta);
     const playPlayerNote = (e) => {
       const idx = Number(e.trackId);
+      applyTrackStrip(e.trackId, idx);
       const overrideKey = playerTrackInstKeys.get(idx);
       let sfInst;
       if (overrideKey) {
@@ -19928,6 +19974,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -19991,8 +20038,10 @@ var createDtmStudio = async (options = {}) => {
       ),
       loadPlayerTrackInstruments()
     ]);
+    const applyTrackStrip = createTrackStripApplier(meta);
     const playPlayerNote = (e) => {
-      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const { trackIdx } = resolveTrackIdxAndRole(e.trackId);
+      applyTrackStrip(e.trackId, trackIdx);
       const overrideKey = playerTrackInstKeys.get(trackIdx);
       let sfInst;
       if (overrideKey) {
@@ -20014,6 +20063,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -20070,8 +20120,10 @@ var createDtmStudio = async (options = {}) => {
       ),
       loadPlayerTrackInstruments()
     ]);
+    const applyTrackStrip = createTrackStripApplier(meta);
     const playPlayerNote = (e) => {
-      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const { trackIdx } = resolveTrackIdxAndRole(e.trackId);
+      applyTrackStrip(e.trackId, trackIdx);
       const overrideKey = playerTrackInstKeys.get(trackIdx);
       let sfInst;
       if (overrideKey) {
@@ -20093,6 +20145,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -20132,6 +20185,7 @@ var createDtmStudio = async (options = {}) => {
       destination: getChannelStrip(e.trackId).input,
       pitch: e.pitch,
       volume: e.volume,
+      velocity: e.velocity,
       when: e.when,
       duration: e.duration
     });
@@ -20188,6 +20242,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip("chord").input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });

package/dist/index.mjs

@@ -8717,8 +8717,8 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     ...normalizeDrumPatterns(options.drumPatterns ?? {})
   };
   const drumPatternName = meta.drum ?? "none";
-  const trackVolume = meta.volume ?? options.volume ?? 100;
-  let masterVolume = options.masterVolume ?? 50;
+  const trackVolume = options.volume ?? 100;
+  let masterVolume = meta.volume ?? options.masterVolume ?? 50;
   const drumVolume = meta.drumVolume ?? 80;
   const colors = options.trackColors ?? DEFAULT_TRACK_COLORS;
   const useSynth = options.synth ?? !options.onPlayNote;
@@ -9024,6 +9024,9 @@ var mountMmlPlayer = (target, mml, options = {}) => {
           singingVoices: options.singingVoices,
           drumPatterns: options.drumPatterns,
           volume: trackVolume,
+          // 解説モーダル内の試聴サンプルも親と同じマスタ音量で鳴らす
+          // （サンプル側のMMLに `#volume=` があればそちらが優先される）。
+          masterVolume,
           // 解説モーダル内の試聴サンプルは規約同意を要求しない。
           skipConsent: true,
           // 再帰的なモーダル生成を防ぐ。
@@ -9791,14 +9794,23 @@ var SoundFont = class _SoundFont {
   /** 発音ごとの音量微揺らぎ幅（比率、0.06 = ±6%の範囲で一様乱数）。 */
   static humanizeGainRatio = 0.06;
   // ── ベロシティ→明るさ連動フィルタ ──
-  // volume は音量にしか効かず音色（明るさ）が変わらないのを補うため、
-  // ローパスのカットオフを volume に連動させる（弱いほど丸く、強いほど明るく）。
-  /** volume=0 のときのローパスカットオフ(Hz)。 */
-  static brightnessMinHz = 1200;
-  /** volume=1 のときのローパスカットオフ(Hz)。サンプルの帯域を実質塞がない値。 */
-  static brightnessMaxHz = 18e3;
+  // velocity は音量にしか効かず音色（明るさ）が変わらないのを補うため、
+  // ローパスのカットオフを velocity に連動させる（弱いほど丸く、強いほど明るく）。
+  // 連動元は必ず velocity であって volume ではない。volume には
+  // 「トラック音量フェーダー×velocity」が既に畳み込まれている（sequencer.ts参照）ため、
+  // volume を使うとフェーダーを下げただけで音色まで暗くなり、音量がゲインと音色へ
+  // 二重に効いてしまう。音量フェーダーは音色を変えてはならない。
+  /** velocity=0 のときのローパスカットオフ(Hz)。 */
+  static brightnessMinHz = 2400;
+  /** velocity=127 のときのローパスカットオフ(Hz)。サンプルの帯域を実質塞がない値。 */
+  static brightnessMaxHz = 2e4;
   /** ベロシティ→明るさフィルタのQ値。共鳴が付かないButterworth特性。 */
   static brightnessQ = Math.SQRT1_2;
+  /**
+   * この明るさ比率以上ならフィルタ自体を挿入しない。最強ベロシティの音は改修前と
+   * 完全に同一の信号経路を通り、余計な音痩せや位相変化が起きないようにするため。
+   */
+  static brightnessBypassAbove = 0.98;
   // ── ロングトーン用ビブラート(ピッチLFO) ──
   // 伸ばす音が完全に静止していると不自然に聞こえるため、一定長以上持続する
   // 音符にだけ、発音直後フェードインしつつ穏やかなピッチ揺れを掛ける。
@@ -9853,6 +9865,7 @@ var SoundFont = class _SoundFont {
     destination,
     pitch = 60,
     volume = 1,
+    velocity,
     when = 0,
     duration = 1
   } = {}) {
@@ -9863,7 +9876,6 @@ var SoundFont = class _SoundFont {
     const zone = zones.get(pitch);
     if (!zone) return;
     const src = ctx.createBufferSource();
-    const filter = ctx.createBiquadFilter();
     const g = ctx.createGain();
     const _when = when + ctx.currentTime;
     const { buffer, _param } = zone;
@@ -9875,13 +9887,16 @@ var SoundFont = class _SoundFont {
     const humanizeGainMul = 1 + (Math.random() * 2 - 1) * _SoundFont.humanizeGainRatio;
     src.detune.setValueAtTime(humanizeCents, 0);
     const effectiveVolume = volume * humanizeGainMul;
-    filter.type = "lowpass";
-    const brightness = Math.max(0, Math.min(1, volume));
-    filter.frequency.setValueAtTime(
-      _SoundFont.brightnessMinHz + (_SoundFont.brightnessMaxHz - _SoundFont.brightnessMinHz) * brightness,
-      0
-    );
-    filter.Q.setValueAtTime(_SoundFont.brightnessQ, 0);
+    const brightness = velocity === void 0 ? 1 : Math.max(0, Math.min(1, velocity / 127));
+    const filter = brightness >= _SoundFont.brightnessBypassAbove ? void 0 : ctx.createBiquadFilter();
+    if (filter) {
+      filter.type = "lowpass";
+      filter.frequency.setValueAtTime(
+        _SoundFont.brightnessMinHz + (_SoundFont.brightnessMaxHz - _SoundFont.brightnessMinHz) * brightness,
+        0
+      );
+      filter.Q.setValueAtTime(_SoundFont.brightnessQ, 0);
+    }
     g.gain.setValueAtTime(0, ctx.currentTime);
     const attackTime = 5e-3;
     const startGainTime = Math.max(ctx.currentTime, _when);
@@ -9893,7 +9908,9 @@ var SoundFont = class _SoundFont {
       g.gain.setValueAtTime(effectiveVolume, startGainTime + attackTime);
       g.gain.linearRampToValueAtTime(0, end);
     }
-    src.connect(filter).connect(g).connect(destination);
+    if (filter) src.connect(filter).connect(g);
+    else src.connect(g);
+    g.connect(destination);
     let vibratoOsc;
     let vibratoDepth;
     if (!isDrum && duration >= _SoundFont.longToneThresholdSec) {
@@ -9914,7 +9931,7 @@ var SoundFont = class _SoundFont {
     src.stop(end);
     src.onended = () => {
       src.disconnect();
-      filter.disconnect();
+      filter?.disconnect();
       g.disconnect();
       vibratoOsc?.disconnect();
       vibratoDepth?.disconnect();
@@ -11008,6 +11025,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
   };
   const wafPlayDynamic = ({
     pitch,
+    velocity,
     volume,
     when,
     duration,
@@ -11021,6 +11039,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
         destination,
         pitch,
         volume: volume * 0.85,
+        velocity,
         when,
         duration
       });
@@ -19205,6 +19224,30 @@ var createDtmStudio = async (options = {}) => {
     }
     return strip;
   };
+  const createTrackStripApplier = (meta) => {
+    const applied = /* @__PURE__ */ new Set();
+    return (stripId, trackIdx) => {
+      if (applied.has(stripId)) return;
+      applied.add(stripId);
+      const strip = getChannelStrip(stripId);
+      const comp = meta.trackCompression?.[trackIdx];
+      if (comp !== void 0) strip.setCompression(comp);
+      const width = meta.trackWidth?.[trackIdx];
+      if (width !== void 0) strip.setWidth(width);
+      const eqLow = meta.trackEqLow?.[trackIdx];
+      if (eqLow !== void 0) strip.setEqLow(eqLow);
+      const eqMid = meta.trackEqMid?.[trackIdx];
+      if (eqMid !== void 0) strip.setEqMid(eqMid);
+      const eqHigh = meta.trackEqHigh?.[trackIdx];
+      if (eqHigh !== void 0) strip.setEqHigh(eqHigh);
+      const reverbSend = meta.trackReverbSend?.[trackIdx];
+      if (reverbSend !== void 0) strip.setReverbSend(reverbSend);
+      const delaySend = meta.trackDelaySend?.[trackIdx];
+      if (delaySend !== void 0) strip.setDelaySend(delaySend);
+      const pan = meta.trackPan?.[trackIdx];
+      if (pan !== void 0) strip.setPan(panToStereo(pan));
+    };
+  };
   const resumeAudio = () => {
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
@@ -19478,6 +19521,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -19771,8 +19815,10 @@ var createDtmStudio = async (options = {}) => {
       ),
       loadPlayerTrackInstruments()
     ]);
+    const applyTrackStrip = createTrackStripApplier(meta);
     const playPlayerNote = (e) => {
       const idx = Number(e.trackId);
+      applyTrackStrip(e.trackId, idx);
       const overrideKey = playerTrackInstKeys.get(idx);
       let sfInst;
       if (overrideKey) {
@@ -19794,6 +19840,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -19857,8 +19904,10 @@ var createDtmStudio = async (options = {}) => {
       ),
       loadPlayerTrackInstruments()
     ]);
+    const applyTrackStrip = createTrackStripApplier(meta);
     const playPlayerNote = (e) => {
-      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const { trackIdx } = resolveTrackIdxAndRole(e.trackId);
+      applyTrackStrip(e.trackId, trackIdx);
       const overrideKey = playerTrackInstKeys.get(trackIdx);
       let sfInst;
       if (overrideKey) {
@@ -19880,6 +19929,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -19936,8 +19986,10 @@ var createDtmStudio = async (options = {}) => {
       ),
       loadPlayerTrackInstruments()
     ]);
+    const applyTrackStrip = createTrackStripApplier(meta);
     const playPlayerNote = (e) => {
-      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const { trackIdx } = resolveTrackIdxAndRole(e.trackId);
+      applyTrackStrip(e.trackId, trackIdx);
       const overrideKey = playerTrackInstKeys.get(trackIdx);
       let sfInst;
       if (overrideKey) {
@@ -19959,6 +20011,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip(e.trackId).input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });
@@ -19998,6 +20051,7 @@ var createDtmStudio = async (options = {}) => {
       destination: getChannelStrip(e.trackId).input,
       pitch: e.pitch,
       volume: e.volume,
+      velocity: e.velocity,
       when: e.when,
       duration: e.duration
     });
@@ -20054,6 +20108,7 @@ var createDtmStudio = async (options = {}) => {
         destination: getChannelStrip("chord").input,
         pitch: e.pitch,
         volume: e.volume,
+        velocity: e.velocity,
         when: e.when,
         duration: e.duration
       });

package/package.json

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