@onjmin/dtm 0.1.58 → 0.1.59

package/README.md

@@ -45,6 +45,34 @@ studio.mountChordPlayer(
 );
 ```
 
+## マスター音量の調整
+
+ライブラリの再生音量は 0-100 のパーセンテージで調整できます。
+
+- `createDtmStudio` / `mountDAW` / `mountEditor` などの DAW 系 API では `masterVolume` を使います。
+- ヘッドレス再生 API（`playMML` / `playChords` / `mountChordPlayer`）では `volume` を使います。
+- 再生中に音量を切り替えたい場合は各インスタンスの `setVolume()` を呼び出します。
+
+```ts
+const studio = await createDtmStudio();
+const daw = studio.mountEditor(editorEl, {
+  initialMML: "@0 t120 o5 l8 ccggaag4 ffeeddc4",
+  masterVolume: 60,
+});
+daw.setVolume(40);
+
+const bgm = playMML("@0 t120 o5 l8 ccggaag4 ffeeddc4", {
+  loop: true,
+  volume: 70,
+});
+bgm.setVolume(50);
+
+const chordPlayer = studio.mountChordPlayer(chordEl, "| C | G | Am | F |", {
+  volume: 80,
+});
+chordPlayer.setVolume(65);
+```
+
 ---
 
 ## モード（`simple` / `advanced`）

package/dist/index.d.mts

@@ -46,6 +46,8 @@ type ChordPlayerInstance = {
     toggleMetronome: () => void;
     /** 再生中か否かを取得する */
     isPlaying: () => boolean;
+    /** マスタ音量を 0-100 で変更する。 */
+    setVolume: (volume: number) => void;
 };
 /**
  * コード進行再生専用プレイヤーを target 要素にマウントする。
@@ -733,6 +735,10 @@ type DawOptions = {
     initialActiveTrack?: string;
     /** 初期スクロールで中央に表示するMIDIピッチ番号（0–127）。未指定なら既定位置。 */
     initialScrollPitch?: number;
+    /** マスタ音量 0-100。既定50。 */
+    masterVolume?: number;
+    /** ドラム音量 0-100。既定80。 */
+    drumVolume?: number;
     parseMidi?: ParseMidiFn;
     /**
      * 動作モード（{@link DawMode}）。
@@ -804,6 +810,12 @@ type DawInstance = {
     applyPatch: (trackId: string, added: NoteData[], removed: NoteRemove[]) => void;
     /** リモートから受信した歌詞・UTAU設定を適用する。 */
     applyLyrics: (trackId: string, data: LyricSyncData) => void;
+    /** マスタ音量を 0-100 で変更する。 */
+    setMasterVolume: (volume: number) => void;
+    /** マスタ音量を 0-100 で変更する（`setMasterVolume` のエイリアス）。 */
+    setVolume: (volume: number) => void;
+    /** ドラム音量を 0-100 で変更する。 */
+    setDrumVolume: (volume: number) => void;
     /** リモートから受信したトラック個別楽器を適用する（`onTrackInstrumentChange` は発火しない）。 */
     applyTrackInstrument: (trackIndex: number, instrumentName: string) => void;
     /**
@@ -1456,6 +1468,8 @@ type MmlPlayerOptions = {
     onResumeAudio?: () => void | Promise<void>;
     /** 内蔵の簡易square-wave synthを使うか。既定は onPlayNote 未指定なら true */
     synth?: boolean;
+    /** マスタ音量 0-100。既定100。 */
+    masterVolume?: number;
     /** BPM未検出時のフォールバック。既定120 */
     defaultBpm?: number;
     /** 各トラックの 0-100 ボリューム。既定100 */
@@ -1487,6 +1501,7 @@ type MmlPlayerInstance = {
     play: () => void;
     stop: () => void;
     isPlaying: () => boolean;
+    setVolume: (volume: number) => void;
     destroy: () => void;
 };
 declare const encodeMml: (mml: string) => Promise<string>;

package/dist/index.d.ts

@@ -46,6 +46,8 @@ type ChordPlayerInstance = {
     toggleMetronome: () => void;
     /** 再生中か否かを取得する */
     isPlaying: () => boolean;
+    /** マスタ音量を 0-100 で変更する。 */
+    setVolume: (volume: number) => void;
 };
 /**
  * コード進行再生専用プレイヤーを target 要素にマウントする。
@@ -733,6 +735,10 @@ type DawOptions = {
     initialActiveTrack?: string;
     /** 初期スクロールで中央に表示するMIDIピッチ番号（0–127）。未指定なら既定位置。 */
     initialScrollPitch?: number;
+    /** マスタ音量 0-100。既定50。 */
+    masterVolume?: number;
+    /** ドラム音量 0-100。既定80。 */
+    drumVolume?: number;
     parseMidi?: ParseMidiFn;
     /**
      * 動作モード（{@link DawMode}）。
@@ -804,6 +810,12 @@ type DawInstance = {
     applyPatch: (trackId: string, added: NoteData[], removed: NoteRemove[]) => void;
     /** リモートから受信した歌詞・UTAU設定を適用する。 */
     applyLyrics: (trackId: string, data: LyricSyncData) => void;
+    /** マスタ音量を 0-100 で変更する。 */
+    setMasterVolume: (volume: number) => void;
+    /** マスタ音量を 0-100 で変更する（`setMasterVolume` のエイリアス）。 */
+    setVolume: (volume: number) => void;
+    /** ドラム音量を 0-100 で変更する。 */
+    setDrumVolume: (volume: number) => void;
     /** リモートから受信したトラック個別楽器を適用する（`onTrackInstrumentChange` は発火しない）。 */
     applyTrackInstrument: (trackIndex: number, instrumentName: string) => void;
     /**
@@ -1456,6 +1468,8 @@ type MmlPlayerOptions = {
     onResumeAudio?: () => void | Promise<void>;
     /** 内蔵の簡易square-wave synthを使うか。既定は onPlayNote 未指定なら true */
     synth?: boolean;
+    /** マスタ音量 0-100。既定100。 */
+    masterVolume?: number;
     /** BPM未検出時のフォールバック。既定120 */
     defaultBpm?: number;
     /** 各トラックの 0-100 ボリューム。既定100 */
@@ -1487,6 +1501,7 @@ type MmlPlayerInstance = {
     play: () => void;
     stop: () => void;
     isPlaying: () => boolean;
+    setVolume: (volume: number) => void;
     destroy: () => void;
 };
 declare const encodeMml: (mml: string) => Promise<string>;

package/dist/index.js

@@ -5539,6 +5539,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   const drumPatternDict = options.drumPatterns ?? DRUM_PATTERNS;
   const drumPattern = meta.drum ? drumPatternDict[meta.drum] ?? null : null;
   const trackVolume = meta.volume ?? options.volume ?? 100;
+  let masterVolume = options.masterVolume ?? 100;
   const drumVolume = meta.drumVolume ?? 80;
   const colors = options.trackColors ?? DEFAULT_TRACK_COLORS;
   const useSynth = options.synth ?? !options.onPlayNote;
@@ -6318,11 +6319,12 @@ var mountMmlPlayer = (target, mml, options = {}) => {
       const em = emojiByTrack.get(trackIdx);
       if (em) jumpEmojiAt(em, e.when);
       if (lyricTracks.has(trackIdx) && !skipSinging) return;
-      options.onPlayNote?.(e);
-      if (useSynth) ensureSynth().playNote(e);
+      const volume = e.volume * (masterVolume / 100);
+      options.onPlayNote?.({ ...e, volume });
+      if (useSynth) ensureSynth().playNote({ ...e, volume });
     },
     onPlayDrum: (e) => {
-      const velocity = e.velocity * (drumVolume / 100) * (trackVolume / 100);
+      const velocity = e.velocity * (drumVolume / 100) * (trackVolume / 100) * (masterVolume / 100);
       options.onPlayDrum?.({ ...e, velocity });
       if (useSynth) ensureSynth().playDrum({ ...e, velocity });
     },
@@ -6346,6 +6348,9 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     if (activePlayer === instance) activePlayer = null;
     options.onStop?.();
   };
+  const setVolume = (volume) => {
+    masterVolume = volume;
+  };
   const buildStreamTracks = () => [...lyricTracks.entries()].map(([index, lt]) => {
     const seqTrack = seqTracks.find((t) => Number(t.id) === index);
     const sorted = [...seqTrack?.notes ?? []].sort(
@@ -6367,7 +6372,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     return {
       id: String(index),
       model: lt.model,
-      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100),
+      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100) * (masterVolume / 100),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
       notes
     };
@@ -6481,6 +6486,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     play,
     stop,
     isPlaying: () => playing,
+    setVolume,
     destroy
   };
   return instance;
@@ -6975,6 +6981,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
   let activeIndex = -1;
   let activePlayback = null;
   let isPlaying = false;
+  let masterVolume = options.volume ?? 80;
   let isLoading = false;
   let loadAbortId = 0;
   let loopEnabled = false;
@@ -7334,7 +7341,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
         container2.innerHTML = "";
         modalSamplePlayer = mountChordPlayer(container2, sampleChords, {
           audioContext: options.audioContext ?? ownCtx ?? void 0,
-          volume: options.volume ?? 100,
+          volume: masterVolume,
           bpm: options.bpm ?? 120,
           studio: options.studio,
           // 再帰的なモーダル生成を防ぐ。
@@ -7675,7 +7682,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
   };
   const playInternal = (startIdx, ctx, cutGain) => {
     const C32 = 48;
-    const volume = options.volume ?? 80;
+    const volume = masterVolume;
     const placements = [];
     for (const event of chordEvents) {
       if (event.when < playOffsetSec) continue;
@@ -7832,6 +7839,10 @@ var mountChordPlayer = (target, chords, options = {}) => {
       }
     }
   };
+  const setVolume = (volume) => {
+    masterVolume = Math.max(0, Math.min(100, volume));
+    activePlayback?.setVolume(masterVolume);
+  };
   const destroy = () => {
     stop();
     closeInfoModal();
@@ -7961,6 +7972,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
     element: container,
     play,
     stop,
+    setVolume,
     destroy,
     toggleMetronome,
     isPlaying: () => isPlaying
@@ -9994,6 +10006,10 @@ var mountDAW = (target, options = {}) => {
     showChord,
     showMidiSearch
   });
+  refs.masterVolume.value = String(options.masterVolume ?? 50);
+  refs.masterVolumeLabel.textContent = `${options.masterVolume ?? 50}%`;
+  refs.drumVolume.value = String(options.drumVolume ?? 80);
+  refs.drumVolumeLabel.textContent = `${options.drumVolume ?? 80}%`;
   const renderConfig = {
     stepsPerBar: 192,
     keyCount: 128,
@@ -10005,8 +10021,8 @@ var mountDAW = (target, options = {}) => {
   let zoomX = 100;
   let zoomY = 100;
   let bpm = options.defaultBpm ?? DEFAULT_BPM;
-  let masterVolume = 50;
-  let drumVolume = 80;
+  let masterVolume = options.masterVolume ?? 50;
+  let drumVolume = options.drumVolume ?? 80;
   let currentDrumPattern = refs.drumSelect.value;
   let currentInstrument = "";
   let activeTrackId = options.initialActiveTrack ?? trackConfigs[0].id;
@@ -12764,6 +12780,21 @@ var mountDAW = (target, options = {}) => {
     getCurrentPlayStep,
     forcePauseAt,
     setLoading,
+    setMasterVolume: (volume) => {
+      masterVolume = clamp3(volume, 0, 100);
+      refs.masterVolume.value = String(masterVolume);
+      refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+    },
+    setVolume: (volume) => {
+      masterVolume = clamp3(volume, 0, 100);
+      refs.masterVolume.value = String(masterVolume);
+      refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+    },
+    setDrumVolume: (volume) => {
+      drumVolume = clamp3(volume, 0, 100);
+      refs.drumVolume.value = String(drumVolume);
+      refs.drumVolumeLabel.textContent = `${drumVolume}%`;
+    },
     applyPatch: (trackId, added, removed) => {
       const track = trackStates.find((t) => t.config.id === trackId);
       if (!track) return;

package/dist/index.mjs

@@ -5417,6 +5417,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   const drumPatternDict = options.drumPatterns ?? DRUM_PATTERNS;
   const drumPattern = meta.drum ? drumPatternDict[meta.drum] ?? null : null;
   const trackVolume = meta.volume ?? options.volume ?? 100;
+  let masterVolume = options.masterVolume ?? 100;
   const drumVolume = meta.drumVolume ?? 80;
   const colors = options.trackColors ?? DEFAULT_TRACK_COLORS;
   const useSynth = options.synth ?? !options.onPlayNote;
@@ -6196,11 +6197,12 @@ var mountMmlPlayer = (target, mml, options = {}) => {
       const em = emojiByTrack.get(trackIdx);
       if (em) jumpEmojiAt(em, e.when);
       if (lyricTracks.has(trackIdx) && !skipSinging) return;
-      options.onPlayNote?.(e);
-      if (useSynth) ensureSynth().playNote(e);
+      const volume = e.volume * (masterVolume / 100);
+      options.onPlayNote?.({ ...e, volume });
+      if (useSynth) ensureSynth().playNote({ ...e, volume });
     },
     onPlayDrum: (e) => {
-      const velocity = e.velocity * (drumVolume / 100) * (trackVolume / 100);
+      const velocity = e.velocity * (drumVolume / 100) * (trackVolume / 100) * (masterVolume / 100);
       options.onPlayDrum?.({ ...e, velocity });
       if (useSynth) ensureSynth().playDrum({ ...e, velocity });
     },
@@ -6224,6 +6226,9 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     if (activePlayer === instance) activePlayer = null;
     options.onStop?.();
   };
+  const setVolume = (volume) => {
+    masterVolume = volume;
+  };
   const buildStreamTracks = () => [...lyricTracks.entries()].map(([index, lt]) => {
     const seqTrack = seqTracks.find((t) => Number(t.id) === index);
     const sorted = [...seqTrack?.notes ?? []].sort(
@@ -6245,7 +6250,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     return {
       id: String(index),
       model: lt.model,
-      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100),
+      volume: vocalVolumeToGain(lt.volume ?? DEFAULT_VOCAL_VOLUME) * (trackVolume / 100) * (masterVolume / 100),
       pan: panToStereo(lt.pan ?? DEFAULT_PAN),
       notes
     };
@@ -6359,6 +6364,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
     play,
     stop,
     isPlaying: () => playing,
+    setVolume,
     destroy
   };
   return instance;
@@ -6853,6 +6859,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
   let activeIndex = -1;
   let activePlayback = null;
   let isPlaying = false;
+  let masterVolume = options.volume ?? 80;
   let isLoading = false;
   let loadAbortId = 0;
   let loopEnabled = false;
@@ -7212,7 +7219,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
         container2.innerHTML = "";
         modalSamplePlayer = mountChordPlayer(container2, sampleChords, {
           audioContext: options.audioContext ?? ownCtx ?? void 0,
-          volume: options.volume ?? 100,
+          volume: masterVolume,
           bpm: options.bpm ?? 120,
           studio: options.studio,
           // 再帰的なモーダル生成を防ぐ。
@@ -7553,7 +7560,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
   };
   const playInternal = (startIdx, ctx, cutGain) => {
     const C32 = 48;
-    const volume = options.volume ?? 80;
+    const volume = masterVolume;
     const placements = [];
     for (const event of chordEvents) {
       if (event.when < playOffsetSec) continue;
@@ -7710,6 +7717,10 @@ var mountChordPlayer = (target, chords, options = {}) => {
       }
     }
   };
+  const setVolume = (volume) => {
+    masterVolume = Math.max(0, Math.min(100, volume));
+    activePlayback?.setVolume(masterVolume);
+  };
   const destroy = () => {
     stop();
     closeInfoModal();
@@ -7839,6 +7850,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
     element: container,
     play,
     stop,
+    setVolume,
     destroy,
     toggleMetronome,
     isPlaying: () => isPlaying
@@ -9872,6 +9884,10 @@ var mountDAW = (target, options = {}) => {
     showChord,
     showMidiSearch
   });
+  refs.masterVolume.value = String(options.masterVolume ?? 50);
+  refs.masterVolumeLabel.textContent = `${options.masterVolume ?? 50}%`;
+  refs.drumVolume.value = String(options.drumVolume ?? 80);
+  refs.drumVolumeLabel.textContent = `${options.drumVolume ?? 80}%`;
   const renderConfig = {
     stepsPerBar: 192,
     keyCount: 128,
@@ -9883,8 +9899,8 @@ var mountDAW = (target, options = {}) => {
   let zoomX = 100;
   let zoomY = 100;
   let bpm = options.defaultBpm ?? DEFAULT_BPM;
-  let masterVolume = 50;
-  let drumVolume = 80;
+  let masterVolume = options.masterVolume ?? 50;
+  let drumVolume = options.drumVolume ?? 80;
   let currentDrumPattern = refs.drumSelect.value;
   let currentInstrument = "";
   let activeTrackId = options.initialActiveTrack ?? trackConfigs[0].id;
@@ -12642,6 +12658,21 @@ var mountDAW = (target, options = {}) => {
     getCurrentPlayStep,
     forcePauseAt,
     setLoading,
+    setMasterVolume: (volume) => {
+      masterVolume = clamp3(volume, 0, 100);
+      refs.masterVolume.value = String(masterVolume);
+      refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+    },
+    setVolume: (volume) => {
+      masterVolume = clamp3(volume, 0, 100);
+      refs.masterVolume.value = String(masterVolume);
+      refs.masterVolumeLabel.textContent = `${masterVolume}%`;
+    },
+    setDrumVolume: (volume) => {
+      drumVolume = clamp3(volume, 0, 100);
+      refs.drumVolume.value = String(drumVolume);
+      refs.drumVolumeLabel.textContent = `${drumVolume}%`;
+    },
     applyPatch: (trackId, added, removed) => {
       const track = trackStates.find((t) => t.config.id === trackId);
       if (!track) return;

package/package.json

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