@onjmin/dtm 1.0.3 → 1.0.5

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;
@@ -8891,14 +8891,20 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   }
   const seqTracks = trackIndices.map((index) => {
     let id = 0;
-    const notes = placements.filter((p) => p.trackIndex === index).map((p) => ({
+    const trackPlacements = placements.filter((p) => p.trackIndex === index);
+    const headerVelocity = trackPlacements[0]?.velocity ?? DEFAULT_VELOCITY;
+    const notes = trackPlacements.map((p) => ({
       id: id++,
       startStep: p.startStep,
       durationSteps: p.durationSteps,
       pitch: p.pitch,
-      velocity: p.velocity
+      velocity: DEFAULT_VELOCITY
     }));
-    return { id: String(index), volume: trackVolume, notes };
+    return {
+      id: String(index),
+      volume: trackVolume * headerVelocity / DEFAULT_VELOCITY,
+      notes
+    };
   });
   const colorOf = (index) => colors[index % colors.length] ?? DEFAULT_TRACK_COLORS[0];
   let audioCtx = null;
@@ -9157,6 +9163,9 @@ var mountMmlPlayer = (target, mml, options = {}) => {
           singingVoices: options.singingVoices,
           drumPatterns: options.drumPatterns,
           volume: trackVolume,
+          // 解説モーダル内の試聴サンプルも親と同じマスタ音量で鳴らす
+          // （サンプル側のMMLに `#volume=` があればそちらが優先される）。
+          masterVolume,
           // 解説モーダル内の試聴サンプルは規約同意を要求しない。
           skipConsent: true,
           // 再帰的なモーダル生成を防ぐ。
@@ -19355,6 +19364,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();
@@ -19922,8 +19955,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) {
@@ -20009,8 +20044,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) {
@@ -20089,8 +20126,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) {

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;
@@ -8758,14 +8758,20 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   }
   const seqTracks = trackIndices.map((index) => {
     let id = 0;
-    const notes = placements.filter((p) => p.trackIndex === index).map((p) => ({
+    const trackPlacements = placements.filter((p) => p.trackIndex === index);
+    const headerVelocity = trackPlacements[0]?.velocity ?? DEFAULT_VELOCITY;
+    const notes = trackPlacements.map((p) => ({
       id: id++,
       startStep: p.startStep,
       durationSteps: p.durationSteps,
       pitch: p.pitch,
-      velocity: p.velocity
+      velocity: DEFAULT_VELOCITY
     }));
-    return { id: String(index), volume: trackVolume, notes };
+    return {
+      id: String(index),
+      volume: trackVolume * headerVelocity / DEFAULT_VELOCITY,
+      notes
+    };
   });
   const colorOf = (index) => colors[index % colors.length] ?? DEFAULT_TRACK_COLORS[0];
   let audioCtx = null;
@@ -9024,6 +9030,9 @@ var mountMmlPlayer = (target, mml, options = {}) => {
           singingVoices: options.singingVoices,
           drumPatterns: options.drumPatterns,
           volume: trackVolume,
+          // 解説モーダル内の試聴サンプルも親と同じマスタ音量で鳴らす
+          // （サンプル側のMMLに `#volume=` があればそちらが優先される）。
+          masterVolume,
           // 解説モーダル内の試聴サンプルは規約同意を要求しない。
           skipConsent: true,
           // 再帰的なモーダル生成を防ぐ。
@@ -19221,6 +19230,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();
@@ -19788,8 +19821,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) {
@@ -19875,8 +19910,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) {
@@ -19955,8 +19992,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) {

package/package.json

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