@onjmin/dtm 0.1.70 → 0.1.72

package/dist/index.js

@@ -13253,7 +13253,10 @@ var playSingingMML = async (mml, options = {}) => {
       const namedIdx = TRACK_ID_BY_INDEX2.indexOf(
         e.trackId
       );
-      const trackIdx = namedIdx >= 0 ? namedIdx : Number(e.trackId);
+      let trackIdx = namedIdx >= 0 ? namedIdx : Number(e.trackId);
+      if (Number.isNaN(trackIdx) && e.trackId.startsWith("t")) {
+        trackIdx = Number(e.trackId.slice(1));
+      }
       if (lyricTracks.has(trackIdx)) return;
       options.onPlayNote?.(e);
       synth?.playNote(e);
@@ -14222,7 +14225,7 @@ var createDtmStudio = async (options = {}) => {
       }
     }
     const playNote4 = (e) => {
-      const trackIdx = tracks.findIndex((t) => t.id === e.trackId);
+      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
       const overrideKey = trackIdx >= 0 ? trackInstOverrides.get(trackIdx) : void 0;
       let sfInst;
       if (overrideKey) {
@@ -14230,7 +14233,7 @@ var createDtmStudio = async (options = {}) => {
       } else {
         sfInst = resolveSoundFont(
           editorPreset,
-          e.trackId,
+          role,
           isAdvancedMode ? "advanced" : "simple"
         );
       }
@@ -14566,33 +14569,50 @@ var createDtmStudio = async (options = {}) => {
     });
   };
   const playSingingMMLInstance = (mml, opts = {}) => {
-    const { placements } = parseMML(mml);
-    const trackIndices = [...new Set(placements.map((p) => p.trackIndex))].sort(
-      (a, b) => a - b
-    );
-    const isAdvancedMode = trackIndices.some((idx) => idx >= 4);
-    const playerPreset = defaultPreset;
-    void loadPreset(
-      playerPreset,
-      trackIndices.map(String),
-      isAdvancedMode ? "advanced" : "simple"
+    const parsed = parseMML(mml, {});
+    const meta = parsed.meta ?? {};
+    const playerPreset = meta.instrument && INSTRUMENT_PRESETS[meta.instrument] ? meta.instrument : defaultPreset;
+    const isAdvancedMode = meta.mode === "advanced" || parsed.placements.some((p) => p.trackIndex >= 4);
+    const trackIndices = [
+      ...new Set(parsed.placements.map((p) => p.trackIndex))
+    ];
+    const trackIds = trackIndices.map(
+      (idx) => getRoleForTrackIndex(idx, isAdvancedMode ? "advanced" : "simple")
     );
-    const playPlayerNote = (e) => {
-      const { role } = resolveTrackIdxAndRole(e.trackId);
-      let sfInst = resolveSoundFont(
+    const loadTrackIds = trackIds.length > 0 ? trackIds : [...TRACK_ROLES];
+    const playerTrackInstKeys = /* @__PURE__ */ new Map();
+    const loadPlayerTrackInstruments = async () => {
+      if (!meta.trackInstruments) return;
+      await listReady;
+      for (const [idxStr, name] of Object.entries(meta.trackInstruments)) {
+        const key = resolveNameToKey(name);
+        if (!key) continue;
+        playerTrackInstKeys.set(Number(idxStr), key);
+        await loadInstrument(key);
+      }
+    };
+    void Promise.all([
+      loadPreset(
         playerPreset,
-        role,
+        loadTrackIds,
         isAdvancedMode ? "advanced" : "simple"
-      );
-      if (!sfInst) {
-        void loadPreset(
-          playerPreset,
-          [role],
+      ),
+      loadPlayerTrackInstruments()
+    ]);
+    const playPlayerNote = (e) => {
+      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const overrideKey = playerTrackInstKeys.get(trackIdx);
+      let sfInst;
+      if (overrideKey) {
+        sfInst = soundFonts.get(overrideKey);
+      } else {
+        const roleFromIdx = getRoleForTrackIndex(
+          trackIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
         sfInst = resolveSoundFont(
           playerPreset,
-          role,
+          roleFromIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
       }

package/dist/index.mjs

@@ -13130,7 +13130,10 @@ var playSingingMML = async (mml, options = {}) => {
       const namedIdx = TRACK_ID_BY_INDEX2.indexOf(
         e.trackId
       );
-      const trackIdx = namedIdx >= 0 ? namedIdx : Number(e.trackId);
+      let trackIdx = namedIdx >= 0 ? namedIdx : Number(e.trackId);
+      if (Number.isNaN(trackIdx) && e.trackId.startsWith("t")) {
+        trackIdx = Number(e.trackId.slice(1));
+      }
       if (lyricTracks.has(trackIdx)) return;
       options.onPlayNote?.(e);
       synth?.playNote(e);
@@ -14098,7 +14101,7 @@ var createDtmStudio = async (options = {}) => {
       }
     }
     const playNote4 = (e) => {
-      const trackIdx = tracks.findIndex((t) => t.id === e.trackId);
+      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
       const overrideKey = trackIdx >= 0 ? trackInstOverrides.get(trackIdx) : void 0;
       let sfInst;
       if (overrideKey) {
@@ -14106,7 +14109,7 @@ var createDtmStudio = async (options = {}) => {
       } else {
         sfInst = resolveSoundFont(
           editorPreset,
-          e.trackId,
+          role,
           isAdvancedMode ? "advanced" : "simple"
         );
       }
@@ -14442,33 +14445,50 @@ var createDtmStudio = async (options = {}) => {
     });
   };
   const playSingingMMLInstance = (mml, opts = {}) => {
-    const { placements } = parseMML(mml);
-    const trackIndices = [...new Set(placements.map((p) => p.trackIndex))].sort(
-      (a, b) => a - b
-    );
-    const isAdvancedMode = trackIndices.some((idx) => idx >= 4);
-    const playerPreset = defaultPreset;
-    void loadPreset(
-      playerPreset,
-      trackIndices.map(String),
-      isAdvancedMode ? "advanced" : "simple"
+    const parsed = parseMML(mml, {});
+    const meta = parsed.meta ?? {};
+    const playerPreset = meta.instrument && INSTRUMENT_PRESETS[meta.instrument] ? meta.instrument : defaultPreset;
+    const isAdvancedMode = meta.mode === "advanced" || parsed.placements.some((p) => p.trackIndex >= 4);
+    const trackIndices = [
+      ...new Set(parsed.placements.map((p) => p.trackIndex))
+    ];
+    const trackIds = trackIndices.map(
+      (idx) => getRoleForTrackIndex(idx, isAdvancedMode ? "advanced" : "simple")
     );
-    const playPlayerNote = (e) => {
-      const { role } = resolveTrackIdxAndRole(e.trackId);
-      let sfInst = resolveSoundFont(
+    const loadTrackIds = trackIds.length > 0 ? trackIds : [...TRACK_ROLES];
+    const playerTrackInstKeys = /* @__PURE__ */ new Map();
+    const loadPlayerTrackInstruments = async () => {
+      if (!meta.trackInstruments) return;
+      await listReady;
+      for (const [idxStr, name] of Object.entries(meta.trackInstruments)) {
+        const key = resolveNameToKey(name);
+        if (!key) continue;
+        playerTrackInstKeys.set(Number(idxStr), key);
+        await loadInstrument(key);
+      }
+    };
+    void Promise.all([
+      loadPreset(
         playerPreset,
-        role,
+        loadTrackIds,
         isAdvancedMode ? "advanced" : "simple"
-      );
-      if (!sfInst) {
-        void loadPreset(
-          playerPreset,
-          [role],
+      ),
+      loadPlayerTrackInstruments()
+    ]);
+    const playPlayerNote = (e) => {
+      const { trackIdx, role } = resolveTrackIdxAndRole(e.trackId);
+      const overrideKey = playerTrackInstKeys.get(trackIdx);
+      let sfInst;
+      if (overrideKey) {
+        sfInst = soundFonts.get(overrideKey);
+      } else {
+        const roleFromIdx = getRoleForTrackIndex(
+          trackIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
         sfInst = resolveSoundFont(
           playerPreset,
-          role,
+          roleFromIdx,
           isAdvancedMode ? "advanced" : "simple"
         );
       }

package/package.json

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