@onjmin/dtm 0.1.79 → 0.1.81

package/dist/index.d.mts

@@ -1862,6 +1862,10 @@ type DtmStudio = {
      * getDaw() で現在の DawInstance を取得できる（mountPresetSelect の getDaw に渡せる）。
      */
     mountModeSwitch: (target: HTMLElement, options: ModeSwitchOptions) => ModeSwitchInstance;
+    /** マスタ音量を 0-100 で変更する。 */
+    setMasterVolume: (volume: number) => void;
+    /** マスタ音量を 0-100 で変更する（`setMasterVolume` のエイリアス）。 */
+    setVolume: (volume: number) => void;
     /** AudioContext を閉じ、生成物を破棄する。 */
     dispose: () => void;
 };

package/dist/index.d.ts

@@ -1862,6 +1862,10 @@ type DtmStudio = {
      * getDaw() で現在の DawInstance を取得できる（mountPresetSelect の getDaw に渡せる）。
      */
     mountModeSwitch: (target: HTMLElement, options: ModeSwitchOptions) => ModeSwitchInstance;
+    /** マスタ音量を 0-100 で変更する。 */
+    setMasterVolume: (volume: number) => void;
+    /** マスタ音量を 0-100 で変更する（`setMasterVolume` のエイリアス）。 */
+    setVolume: (volume: number) => void;
     /** AudioContext を閉じ、生成物を破棄する。 */
     dispose: () => void;
 };

package/dist/index.js

@@ -7062,9 +7062,10 @@ var loadDrumFont = (ctx, pitch) => {
   return p;
 };
 var BAR_SEP = /[|lｌ→]/;
+var toHalfWidth = (str) => str.replace(/[！-～]/g, (ch) => String.fromCharCode(ch.charCodeAt(0) - 65248)).replace(/　/g, " ");
 var NON_EVENT_RE = /^[=_]$|^N\.C\.$|^N$/i;
 var buildDisplayLines = (chords, eventsCount) => {
-  const rawLines = chords.split("\n").map((l) => l.trim()).filter((l) => l);
+  const rawLines = toHalfWidth(chords).split("\n").map((l) => l.trim()).filter((l) => l);
   const displayLines = [];
   let eventCounter = 0;
   let colorIdx = 0;
@@ -7798,7 +7799,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
       if (beatAbsSec >= now - 0.01) {
         const isDownbeat = beat % 4 === 0;
         const pitch = isDownbeat ? DRUM_KEYS.kick : DRUM_KEYS.hihatClosed;
-        const velocity = isDownbeat ? 0.7 : 0.45;
+        const velocity = (isDownbeat ? 0.7 : 0.45) * (masterVolume / 100);
         const wafDrum = _drumCache.get(pitch);
         if (wafDrum) {
           wafDrum.play({
@@ -14027,7 +14028,7 @@ var createDtmStudio = async (options = {}) => {
   masterGain.connect(audioCtx.destination);
   const drumGain = audioCtx.createGain();
   drumGain.gain.value = options.drumVolume ?? 1;
-  drumGain.connect(audioCtx.destination);
+  drumGain.connect(masterGain);
   const resumeAudio = () => {
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
@@ -14793,6 +14794,10 @@ var createDtmStudio = async (options = {}) => {
     mountedEditors.length = 0;
     void audioCtx.close();
   };
+  const setMasterVolume = (volume) => {
+    const g = Math.max(0, Math.min(100, volume)) / 100;
+    masterGain.gain.setValueAtTime(g, audioCtx.currentTime);
+  };
   return {
     audioContext: audioCtx,
     singingVoices,
@@ -14809,6 +14814,8 @@ var createDtmStudio = async (options = {}) => {
     defaultPreset,
     mountPresetSelect,
     mountModeSwitch,
+    setMasterVolume,
+    setVolume: setMasterVolume,
     dispose
   };
 };

package/dist/index.mjs

@@ -6939,9 +6939,10 @@ var loadDrumFont = (ctx, pitch) => {
   return p;
 };
 var BAR_SEP = /[|lｌ→]/;
+var toHalfWidth = (str) => str.replace(/[！-～]/g, (ch) => String.fromCharCode(ch.charCodeAt(0) - 65248)).replace(/　/g, " ");
 var NON_EVENT_RE = /^[=_]$|^N\.C\.$|^N$/i;
 var buildDisplayLines = (chords, eventsCount) => {
-  const rawLines = chords.split("\n").map((l) => l.trim()).filter((l) => l);
+  const rawLines = toHalfWidth(chords).split("\n").map((l) => l.trim()).filter((l) => l);
   const displayLines = [];
   let eventCounter = 0;
   let colorIdx = 0;
@@ -7675,7 +7676,7 @@ var mountChordPlayer = (target, chords, options = {}) => {
       if (beatAbsSec >= now - 0.01) {
         const isDownbeat = beat % 4 === 0;
         const pitch = isDownbeat ? DRUM_KEYS.kick : DRUM_KEYS.hihatClosed;
-        const velocity = isDownbeat ? 0.7 : 0.45;
+        const velocity = (isDownbeat ? 0.7 : 0.45) * (masterVolume / 100);
         const wafDrum = _drumCache.get(pitch);
         if (wafDrum) {
           wafDrum.play({
@@ -13903,7 +13904,7 @@ var createDtmStudio = async (options = {}) => {
   masterGain.connect(audioCtx.destination);
   const drumGain = audioCtx.createGain();
   drumGain.gain.value = options.drumVolume ?? 1;
-  drumGain.connect(audioCtx.destination);
+  drumGain.connect(masterGain);
   const resumeAudio = () => {
     if (audioCtx.state === "closed") return Promise.resolve();
     return audioCtx.resume();
@@ -14669,6 +14670,10 @@ var createDtmStudio = async (options = {}) => {
     mountedEditors.length = 0;
     void audioCtx.close();
   };
+  const setMasterVolume = (volume) => {
+    const g = Math.max(0, Math.min(100, volume)) / 100;
+    masterGain.gain.setValueAtTime(g, audioCtx.currentTime);
+  };
   return {
     audioContext: audioCtx,
     singingVoices,
@@ -14685,6 +14690,8 @@ var createDtmStudio = async (options = {}) => {
     defaultPreset,
     mountPresetSelect,
     mountModeSwitch,
+    setMasterVolume,
+    setVolume: setMasterVolume,
     dispose
   };
 };

package/package.json

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