@onjmin/dtm 0.1.100 → 0.1.101

package/dist/index.d.mts

@@ -1885,7 +1885,7 @@ type MmlPlayerOptions = {
     onResumeAudio?: () => void | Promise<void>;
     /** 内蔵の簡易square-wave synthを使うか。既定は onPlayNote 未指定なら true */
     synth?: boolean;
-    /** マスタ音量 0-100。既定100。 */
+    /** マスタ音量 0-100。既定50（DAW編集画面の全体音量スライダーの既定値に合わせている）。 */
     masterVolume?: number;
     /** BPM未検出時のフォールバック。既定120 */
     defaultBpm?: number;

package/dist/index.d.ts

@@ -1885,7 +1885,7 @@ type MmlPlayerOptions = {
     onResumeAudio?: () => void | Promise<void>;
     /** 内蔵の簡易square-wave synthを使うか。既定は onPlayNote 未指定なら true */
     synth?: boolean;
-    /** マスタ音量 0-100。既定100。 */
+    /** マスタ音量 0-100。既定50（DAW編集画面の全体音量スライダーの既定値に合わせている）。 */
     masterVolume?: number;
     /** BPM未検出時のフォールバック。既定120 */
     defaultBpm?: number;

package/dist/index.js

@@ -8851,7 +8851,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   };
   const drumPatternName = meta.drum ?? "none";
   const trackVolume = meta.volume ?? options.volume ?? 100;
-  let masterVolume = options.masterVolume ?? 100;
+  let masterVolume = options.masterVolume ?? 50;
   const drumVolume = meta.drumVolume ?? 80;
   const colors = options.trackColors ?? DEFAULT_TRACK_COLORS;
   const useSynth = options.synth ?? !options.onPlayNote;
@@ -18219,6 +18219,8 @@ var playSingingMML = async (mml, options = {}) => {
   const drumVolume = meta.drumVolume ?? 80;
   const trackVolume = meta.volume ?? 100;
   let masterVolume = options.volume ?? 100;
+  const trackVolumePercent = () => trackVolume / 100 * masterVolume;
+  const masterGainScalar = () => trackVolume / 100 * (masterVolume / 100);
   const trackIndices = [...new Set(placements.map((p) => p.trackIndex))].sort(
     (a, b) => a - b
   );
@@ -18233,7 +18235,7 @@ var playSingingMML = async (mml, options = {}) => {
     }));
     return {
       id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
-      volume: trackVolume / 100 * masterVolume,
+      volume: trackVolumePercent(),
       notes
     };
   });
@@ -18270,7 +18272,7 @@ var playSingingMML = async (mml, options = {}) => {
     return {
       id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
       model: lt.model,
-      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME),
+      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * masterGainScalar(),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
       vibrato: lt.vibrato,
       reverbSend: (lt.reverb ?? 0) / 100,
@@ -18305,7 +18307,7 @@ var playSingingMML = async (mml, options = {}) => {
       synth?.playNote(e);
     },
     onPlayDrum: (e) => {
-      const velocity = e.velocity * (drumVolume / 100) * (trackVolume / 100) * (masterVolume / 100);
+      const velocity = e.velocity * (drumVolume / 100) * masterGainScalar();
       options.onPlayDrum?.({ ...e, velocity });
       synth?.playDrum({ ...e, velocity });
     },
@@ -18339,9 +18341,8 @@ var playSingingMML = async (mml, options = {}) => {
   };
   const setVolume = (volume) => {
     masterVolume = volume;
-    const effectiveTrackVolume = trackVolume / 100 * masterVolume;
-    for (const t of seqTracks) t.volume = effectiveTrackVolume;
-    voices?.setVolume(trackVolume / 100 * (masterVolume / 100));
+    for (const t of seqTracks) t.volume = trackVolumePercent();
+    voices?.setVolume(masterGainScalar());
   };
   const suspend = () => ctx.suspend();
   const resume = () => ctx.resume();
@@ -18427,7 +18428,7 @@ var playSingingMML = async (mml, options = {}) => {
         loopLengthSec = (loopEndStep - loopStartStep) * secondsPerStep;
       }
       seq.start(options.startStep ?? 0);
-      voices.setVolume(trackVolume / 100 * (masterVolume / 100));
+      voices.setVolume(masterGainScalar());
       voices.startStream(streamTracks, seq.getStartTime(), {
         loopLengthSec,
         loopStartSec

package/dist/index.mjs

@@ -8718,7 +8718,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   };
   const drumPatternName = meta.drum ?? "none";
   const trackVolume = meta.volume ?? options.volume ?? 100;
-  let masterVolume = options.masterVolume ?? 100;
+  let masterVolume = options.masterVolume ?? 50;
   const drumVolume = meta.drumVolume ?? 80;
   const colors = options.trackColors ?? DEFAULT_TRACK_COLORS;
   const useSynth = options.synth ?? !options.onPlayNote;
@@ -18086,6 +18086,8 @@ var playSingingMML = async (mml, options = {}) => {
   const drumVolume = meta.drumVolume ?? 80;
   const trackVolume = meta.volume ?? 100;
   let masterVolume = options.volume ?? 100;
+  const trackVolumePercent = () => trackVolume / 100 * masterVolume;
+  const masterGainScalar = () => trackVolume / 100 * (masterVolume / 100);
   const trackIndices = [...new Set(placements.map((p) => p.trackIndex))].sort(
     (a, b) => a - b
   );
@@ -18100,7 +18102,7 @@ var playSingingMML = async (mml, options = {}) => {
     }));
     return {
       id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
-      volume: trackVolume / 100 * masterVolume,
+      volume: trackVolumePercent(),
       notes
     };
   });
@@ -18137,7 +18139,7 @@ var playSingingMML = async (mml, options = {}) => {
     return {
       id: TRACK_ID_BY_INDEX2[index] ?? `t${index}`,
       model: lt.model,
-      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME),
+      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * masterGainScalar(),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
       vibrato: lt.vibrato,
       reverbSend: (lt.reverb ?? 0) / 100,
@@ -18172,7 +18174,7 @@ var playSingingMML = async (mml, options = {}) => {
       synth?.playNote(e);
     },
     onPlayDrum: (e) => {
-      const velocity = e.velocity * (drumVolume / 100) * (trackVolume / 100) * (masterVolume / 100);
+      const velocity = e.velocity * (drumVolume / 100) * masterGainScalar();
       options.onPlayDrum?.({ ...e, velocity });
       synth?.playDrum({ ...e, velocity });
     },
@@ -18206,9 +18208,8 @@ var playSingingMML = async (mml, options = {}) => {
   };
   const setVolume = (volume) => {
     masterVolume = volume;
-    const effectiveTrackVolume = trackVolume / 100 * masterVolume;
-    for (const t of seqTracks) t.volume = effectiveTrackVolume;
-    voices?.setVolume(trackVolume / 100 * (masterVolume / 100));
+    for (const t of seqTracks) t.volume = trackVolumePercent();
+    voices?.setVolume(masterGainScalar());
   };
   const suspend = () => ctx.suspend();
   const resume = () => ctx.resume();
@@ -18294,7 +18295,7 @@ var playSingingMML = async (mml, options = {}) => {
         loopLengthSec = (loopEndStep - loopStartStep) * secondsPerStep;
       }
       seq.start(options.startStep ?? 0);
-      voices.setVolume(trackVolume / 100 * (masterVolume / 100));
+      voices.setVolume(masterGainScalar());
       voices.startStream(streamTracks, seq.getStartTime(), {
         loopLengthSec,
         loopStartSec

package/package.json

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