@onjmin/dtm 2.0.2 → 2.0.3

package/dist/index.mjs

@@ -1569,6 +1569,9 @@ var createChannelStrip = (ctx, destination, options = {}) => {
 };
 
 // src/tuning.ts
+var units = (n) => n;
+var midiNote = (n) => n;
+var addUnits = (a, delta) => a + delta;
 var UNITS_PER_OCTAVE = 372;
 var UNITS_PER_SEMITONE = 372 / 12;
 var UNITS_PER_EDO31_DEGREE = 372 / 31;
@@ -1578,13 +1581,13 @@ var A4_HZ = 440;
 var DEFAULT_EDO = 12;
 var unitsPerStep = (edo) => UNITS_PER_OCTAVE / edo;
 var midiToUnits = (midi) => midi * UNITS_PER_SEMITONE;
-var unitsToMidi = (units) => units / UNITS_PER_SEMITONE;
-var unitsToHz = (units) => A4_HZ * 2 ** ((units - A4_UNITS) / UNITS_PER_OCTAVE);
-var unitsToMidiDetune = (units) => {
-  const midi = Math.round(units / UNITS_PER_SEMITONE);
+var unitsToMidi = (u) => u / UNITS_PER_SEMITONE;
+var unitsToHz = (u) => A4_HZ * 2 ** ((u - A4_UNITS) / UNITS_PER_OCTAVE);
+var unitsToMidiDetune = (u) => {
+  const midi = Math.round(u / UNITS_PER_SEMITONE);
   return {
     midi,
-    detuneCents: (units - midi * UNITS_PER_SEMITONE) * CENTS_PER_UNIT
+    detuneCents: (u - midi * UNITS_PER_SEMITONE) * CENTS_PER_UNIT
   };
 };
 var NATURAL_STEPS = {
@@ -1610,7 +1613,7 @@ var fifthToStep = (fifthIndex, edo) => {
 var fifthToUnits = (fifthIndex, edo) => fifthToStep(fifthIndex, edo) * unitsPerStep(edo);
 var PITCH_ENCODING_VERSION = 2;
 var pitchV1ToUnits = (pitch) => pitch * UNITS_PER_SEMITONE;
-var unitsToPitchV1 = (units) => Math.round(units / UNITS_PER_SEMITONE);
+var unitsToPitchV1 = (u) => Math.round(u / UNITS_PER_SEMITONE);
 
 // src/chords.ts
 var C3 = 48;
@@ -1623,7 +1626,9 @@ var chordToneToUnits = (relSemitone, relFifth, rootSemitone, rootFifth, edo) =>
   const relWithin12 = (relSemitone % 12 + 12) % 12;
   const relOct = Math.round((relSemitone - relWithin12) / 12);
   const relStep = (fifthToStep(relFifth, edo) - fifthToStep(rootFifth, edo) + edo) % edo;
-  return (rootOct + relOct) * UNITS_PER_OCTAVE + (rootStep + relStep) * perStep;
+  return units(
+    (rootOct + relOct) * UNITS_PER_OCTAVE + (rootStep + relStep) * perStep
+  );
 };
 var buildChordPlacements = (options) => {
   const {
@@ -2199,7 +2204,7 @@ var Worldline = class _Worldline {
     const WL = this.wasm;
     const FS = WORLDLINE_SAMPLE_RATE;
     const basePitch = sampleCurve(preMs + durationMs / 2, pitch, preMs + durationMs);
-    const midiNote = Math.round(69 + 12 * Math.log2(basePitch / 440));
+    const midiNote2 = Math.round(69 + 12 * Math.log2(basePitch / 440));
     const posMs = 0;
     const reqLen = preMs + durationMs;
     const cutMs = WL_FRAME_MS * 2;
@@ -2223,7 +2228,7 @@ var Worldline = class _Worldline {
     sv(8, samplePtr, "*");
     sv(12, 0, "i32");
     sv(16, 0, "*");
-    sv(20, midiNote, "i32");
+    sv(20, midiNote2, "i32");
     sv(24, 100, "double");
     sv(32, 0, "double");
     sv(40, reqLen, "double");
@@ -2720,8 +2725,8 @@ var FORMANTS = {
   // 撥音(ん)は鼻音寄りの低フォルマント
   N: [250, 1e3]
 };
-var unitsToFreq = (units) => 440 * 2 ** ((units - 2139) / 372);
-var unitsToMidiFloat = (units) => units / 31;
+var unitsToFreq = (units2) => 440 * 2 ** ((units2 - 2139) / 372);
+var unitsToMidiFloat = (units2) => units2 / 31;
 var createKlattVoice = (ctx, destination, reverbBus, delayBus) => {
   const active = /* @__PURE__ */ new Set();
   const voice = (syllable, e) => {
@@ -3530,7 +3535,7 @@ var createSingingVoices = (ctx, destination, options = {}) => {
           };
           dispatchNote(note.pitch, 1);
           for (const offset of octaveUnisonOffsets(track.octaveUnison)) {
-            dispatchNote(note.pitch + offset, OCTAVE_UNISON_PEAK_SCALE);
+            dispatchNote(units(note.pitch + offset), OCTAVE_UNISON_PEAK_SCALE);
           }
           if (!(model.renderToCache && model.scheduleCached)) {
             await new Promise((resolve) => setTimeout(resolve, 0));
@@ -3956,7 +3961,9 @@ var parseMML = (mml, options = {}) => {
             let pitchSteps = naturals[c];
             j++;
             pitchSteps += readAccidentals();
-            chordNotes.push((octave + 1) * 372 + pitchSteps * unitsPerStep2);
+            chordNotes.push(
+              units((octave + 1) * 372 + pitchSteps * unitsPerStep2)
+            );
           } else if (c === ">") {
             octave = Math.min(8, octave + 1);
             j++;
@@ -3994,7 +4001,7 @@ var parseMML = (mml, options = {}) => {
         let pitchSteps = naturals[ch];
         j++;
         pitchSteps += readAccidentals();
-        const midiPitch = (octave + 1) * 372 + pitchSteps * unitsPerStep2;
+        const midiPitch = units((octave + 1) * 372 + pitchSteps * unitsPerStep2);
         const steps = parseLength();
         recordContributor();
         placements.push({
@@ -9851,7 +9858,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
       if (n.startStep < fromStep) continue;
       notes.push({
         syllable: lt.syllables[i2],
-        pitch: n.pitchUnits + semis,
+        pitch: units(n.pitchUnits + semis),
         startSec: (n.startStep - fromStep) * secondsPerStep,
         durationSec: n.durationSteps * secondsPerStep * gate
       });
@@ -12271,7 +12278,7 @@ var generateRandomPattern = (core, options) => {
   for (let i2 = 0; i2 < 12; i2++) {
     const noteInOctave = (i2 - rootOffset + 12) % 12;
     if (scale.includes(noteInOctave))
-      availablePitches.push(basePitch + semitoneToStep(i2) * upr);
+      availablePitches.push(units(basePitch + semitoneToStep(i2) * upr));
   }
   core.beginBatch();
   for (let bar = 0; bar < numBars; bar++) {
@@ -12386,9 +12393,11 @@ var transposeNotes = (cores, steps) => {
   for (const core of cores) {
     const notes = [...core.getNotes()];
     for (const note of notes) {
-      const newPitch = Math.max(
-        PITCH_RANGE_START,
-        Math.min(PITCH_RANGE_END, note.pitchUnits + steps)
+      const newPitch = units(
+        Math.max(
+          PITCH_RANGE_START,
+          Math.min(PITCH_RANGE_END, note.pitchUnits + steps)
+        )
       );
       if (newPitch !== note.pitchUnits) {
         core.moveNote(note.id, note.startStep, newPitch);
@@ -13242,9 +13251,8 @@ var MMLCore = class _MMLCore {
     const upr = cfg.unitsPerRow ?? UNITS_PER_SEMITONE;
     const pitchRangeStart = cfg.pitchRangeStart;
     const pitchRangeEnd = pitchRangeStart + (cfg.keyCount - 1) * upr;
-    const clampedPitch = Math.min(
-      Math.max(pitch, pitchRangeStart),
-      pitchRangeEnd
+    const clampedPitch = units(
+      Math.min(Math.max(pitch, pitchRangeStart), pitchRangeEnd)
     );
     const clampedStart = Math.min(
       Math.max(startStep, 0),
@@ -13638,12 +13646,12 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
     const MICRO_RATIO = 0.45;
     for (let y = startY; y < endY; y += keyHeight) {
       const rowIndex = keyCount - 1 - y / keyHeight;
-      const units = pitchRangeStart + rowIndex * upr;
+      const units2 = pitchRangeStart + rowIndex * upr;
       const step = Math.round(
-        (units % UNITS_PER_OCTAVE + UNITS_PER_OCTAVE) % UNITS_PER_OCTAVE / upr % edo
+        (units2 % UNITS_PER_OCTAVE + UNITS_PER_OCTAVE) % UNITS_PER_OCTAVE / upr % edo
       );
       const tier = keyTier(step, edo);
-      const octave = Math.floor(units / UNITS_PER_OCTAVE) - 1;
+      const octave = Math.floor(units2 / UNITS_PER_OCTAVE) - 1;
       const isC4Range = octave === 4;
       const screenY = y - g_draw_offset_y;
       const bkW = Math.floor(
@@ -13743,13 +13751,13 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
     const endY = g_draw_offset_y + g_grid_canvas.height;
     for (let y = startY; y < endY; y += keyHeight) {
       const rowIndex = keyCount - 1 - y / keyHeight;
-      const units = pitchRangeStart + rowIndex * upr;
+      const units2 = pitchRangeStart + rowIndex * upr;
       const step = Math.round(
-        (units % UNITS_PER_OCTAVE + UNITS_PER_OCTAVE) % UNITS_PER_OCTAVE / upr % edo
+        (units2 % UNITS_PER_OCTAVE + UNITS_PER_OCTAVE) % UNITS_PER_OCTAVE / upr % edo
       );
       const tier = keyTier(step, edo);
       const isC = step === 0;
-      const octave = Math.floor(units / UNITS_PER_OCTAVE) - 1;
+      const octave = Math.floor(units2 / UNITS_PER_OCTAVE) - 1;
       const isC4Range = octave === 4;
       const screenY = y - g_draw_offset_y;
       g_grid_ctx.fillStyle = g_bg_active ? tier === 2 ? "rgba(8,11,22,0.55)" : tier === 1 ? "rgba(12,16,30,0.5)" : "rgba(17,22,40,0.45)" : tier === 2 ? "#080b16" : tier === 1 ? "#0c101d" : "#111628";
@@ -13930,7 +13938,7 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
     const step = Math.floor((x2 + g_draw_offset_x) / stepWidth);
     const absoluteY = y + g_draw_offset_y;
     const yIndex = Math.floor(absoluteY / keyHeight);
-    const pitch = pitchRangeStart + (keyCount - 1 - yIndex) * upr;
+    const pitch = units(pitchRangeStart + (keyCount - 1 - yIndex) * upr);
     return { step, pitch, x: x2, y };
   };
   const onClick = (callback) => {
@@ -13948,7 +13956,7 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
         const step = Math.floor((x2 + g_draw_offset_x) / stepWidth);
         const absoluteY = y + g_draw_offset_y;
         const yIndex = Math.floor(absoluteY / keyHeight);
-        const pitch = pitchRangeStart + (keyCount - 1 - yIndex) * upr;
+        const pitch = units(pitchRangeStart + (keyCount - 1 - yIndex) * upr);
         if (pitch >= pitchRangeStart && pitch < pitchRangeStart + keyCount) {
           requestAnimationFrame(() => callback(step, pitch));
         }
@@ -14655,9 +14663,9 @@ var mountDAW = (target, options = {}) => {
     options.singingVoices?.setVolume(masterVolume / 100);
   };
   applyMasterVolume(masterVolume);
-  const snapToEdoGrid = (units) => {
+  const snapToEdoGrid = (u) => {
     const upr = renderConfig.unitsPerRow ?? UNITS_PER_SEMITONE;
-    return Math.round(units / upr) * upr;
+    return units(Math.round(u / upr) * upr);
   };
   const applyEdo = (edo, opts) => {
     const next = edo === 31 ? 31 : 12;
@@ -14670,7 +14678,7 @@ var mountDAW = (target, options = {}) => {
     for (const t of trackStates) {
       t.core.beginBatch();
       for (const note of [...t.core.getNotes()]) {
-        const snapped = Math.round(note.pitchUnits / upr) * upr;
+        const snapped = units(Math.round(note.pitchUnits / upr) * upr);
         if (snapped !== note.pitchUnits)
           t.core.moveNote(note.id, note.startStep, snapped);
       }
@@ -15370,7 +15378,7 @@ var mountDAW = (target, options = {}) => {
       if (dragState.mode === "move") {
         const nextStart = step - dragState.dragOffsetStep;
         const snappedStart = Math.round(nextStart / snapGridSteps) * snapGridSteps;
-        const nextPitch = pitch - dragState.dragOffsetPitch;
+        const nextPitch = units(pitch - dragState.dragOffsetPitch);
         if (hasNoteAt(snappedStart, nextPitch, dragState.noteId)) return;
         active.core.moveNote(dragState.noteId, snappedStart, nextPitch);
         if (nextPitch !== dragState.lastPreviewPitch) {
@@ -15426,7 +15434,7 @@ var mountDAW = (target, options = {}) => {
           for (const note of selectedNotes) {
             const orig = selectedOriginal.find((o) => o.id === note.id);
             if (!orig) continue;
-            const newPitch = orig.pitch + deltaPitch;
+            const newPitch = units(orig.pitch + deltaPitch);
             if (newPitch >= PITCH_RANGE_START && newPitch <= PITCH_RANGE_END)
               active.core.moveNote(
                 note.id,
@@ -15438,7 +15446,7 @@ var mountDAW = (target, options = {}) => {
             const grab = selectedNotes[0];
             const orig = selectedOriginal.find((o) => o.id === grab.id);
             if (orig) {
-              const newGrab = orig.pitch + deltaPitch;
+              const newGrab = units(orig.pitch + deltaPitch);
               if (newGrab !== lastMultiPreviewPitch && newGrab >= 0 && newGrab < 128) {
                 lastMultiPreviewPitch = newGrab;
                 playPreview(newGrab);
@@ -15757,7 +15765,7 @@ var mountDAW = (target, options = {}) => {
         if (n.startStep < fromStep) continue;
         notes.push({
           syllable: lt.syllables[i2],
-          pitch: n.pitchUnits + semis,
+          pitch: units(n.pitchUnits + semis),
           startSec: (n.startStep - fromStep) * secondsPerStep,
           durationSec: n.durationSteps * secondsPerStep * gate
         });
@@ -16963,7 +16971,7 @@ var mountDAW = (target, options = {}) => {
     }
     if (candidateNotes.length === 0) return null;
     const sum = candidateNotes.reduce((acc, note) => acc + note.pitchUnits, 0);
-    return Math.round(sum / candidateNotes.length);
+    return units(Math.round(sum / candidateNotes.length));
   };
   const centerPitch = (pitch) => {
     const canvas = renderer.getGridCanvas();
@@ -17284,8 +17292,6 @@ var mountDAW = (target, options = {}) => {
       active.vocalOctaveUnison = "none";
     } else {
       clearAll();
-      applyEdo(12);
-      refs.edoSelect.value = String(renderConfig.edo ?? 12);
       for (const t of trackStates) t.core.setLoadMode(true);
       for (const t of trackStates) {
         t.lyrics = "";
@@ -17534,11 +17540,20 @@ var mountDAW = (target, options = {}) => {
           return;
         }
       }
-      applyEdo(next, { snap: true });
-      const first = getFirstDetectedPitch();
-      centerPitch(first ?? pitchV1ToUnits(48));
-      redrawAll();
-      updateUndoRedo();
+      overlayDuring(() => {
+        applyEdo(next, { snap: true });
+        if (next === 31 && prev === 12) {
+          zoomY = Math.max(50, Math.round(zoomY / 2 / 25) * 25);
+        } else if (next === 12 && prev === 31) {
+          zoomY = Math.min(200, Math.round(zoomY * 2 / 25) * 25);
+        }
+        applyZoomY();
+        const first = getFirstDetectedPitch();
+        centerPitch(first ?? pitchV1ToUnits(48));
+        redrawAll();
+        updateUndoRedo();
+        notifyViewState();
+      });
     });
     refs.edoInfoBtn.addEventListener("click", () => {
       showModal("\u97F3\u5F8B\u306E\u89E3\u8AAC", EDO_INFO_HTML);
@@ -18911,7 +18926,7 @@ var playSingingMML = async (mml, options = {}) => {
       if (n.startStep < fromStep) continue;
       notes.push({
         syllable: lt.syllables[i2],
-        pitch: n.pitchUnits + semis,
+        pitch: units(n.pitchUnits + semis),
         startSec: (n.startStep - fromStep) * secondsPerStep,
         durationSec: n.durationSteps * secondsPerStep * gate
       });
@@ -19194,7 +19209,7 @@ var createPianoRoll = (options, handlers) => {
         const pitchDelta = nextPitch2 - baseNote.pitchUnits;
         for (const note of dragState.selectedNotes) {
           const newStart = note.startStep + stepDelta;
-          const newPitch = note.pitchUnits + pitchDelta;
+          const newPitch = units(note.pitchUnits + pitchDelta);
           core.moveNote(note.id, newStart, newPitch);
         }
         if (options.onPreviewSound && pitch !== lastPreviewPitch) {
@@ -19205,7 +19220,7 @@ var createPianoRoll = (options, handlers) => {
         return;
       }
       const nextStart = step - dragState.dragOffsetStep;
-      const nextPitch = pitch - dragState.dragOffsetPitch;
+      const nextPitch = units(pitch - dragState.dragOffsetPitch);
       core.moveNote(dragState.noteId, nextStart, nextPitch);
       return;
     }
@@ -21015,6 +21030,7 @@ export {
   VIBRATO_MIN_SEC,
   VOICE_IMAGES,
   VOICE_IMAGE_KEY,
+  addUnits,
   analyzeMidiTracks,
   applyHarmonicFilter,
   applyMonophonic,
@@ -21059,6 +21075,7 @@ export {
   isValidHttpUrl,
   keyCountFor,
   koeUrl,
+  midiNote,
   midiToUnits,
   mountChordPlayer,
   mountDAW,
@@ -21086,6 +21103,7 @@ export {
   stripLyrics,
   stripMmlMeta,
   transposeNotes,
+  units,
   unitsPerRow,
   unitsPerStep,
   unitsToHz,

package/package.json

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