From 0b7a5e7fe0c668439cc62b229be4be7704eba396 Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Tue, 27 Sep 2022 18:11:19 +0900
Subject: [PATCH 01/59] =?UTF-8?q?project-s:=20=E9=96=8B=E7=99=BA=E7=94=A8?=
 =?UTF-8?q?=E3=81=AB=E3=82=BF=E3=83=96=E5=88=86=E5=89=B2=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=20(#955)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Romot <romot@romotmbp16.local>
---
 src/components/SingerTab.vue | 46 ++++++++++++++++++++++++++++++++++++
 src/router/index.ts          |  5 ++++
 src/views/Home.vue           |  3 +++
 src/views/SingerHome.vue     | 40 +++++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+)
 create mode 100644 src/components/SingerTab.vue
 create mode 100644 src/views/SingerHome.vue

diff --git a/src/components/SingerTab.vue b/src/components/SingerTab.vue
new file mode 100644
index 0000000000..2bac5c6a82
--- /dev/null
+++ b/src/components/SingerTab.vue
@@ -0,0 +1,46 @@
+<template>
+  <nav role="tab">
+    <ul class="singer-tab">
+      <li class="singer-tab-item">
+        <router-link to="/home">ボイス</router-link>
+      </li>
+      <li class="singer-tab-item">
+        <router-link to="/singer-home">シング</router-link>
+      </li>
+    </ul>
+  </nav>
+</template>
+
+<script lang="ts">
+import { defineComponent, onMounted } from "vue";
+//import { useStore } from "@/store";
+//import { useRoute, useRouter } from "vue-router";
+export default defineComponent({
+  setup() {
+    //const store = useStore();
+    onMounted(async () => {
+      return null;
+    });
+    return null;
+  },
+});
+</script>
+
+<style scoped lang="scss">
+.singer-tab {
+  border-bottom: 1px solid #ccc;
+  display: flex;
+  list-style: none;
+  padding-left: 0;
+}
+.singer-tab a {
+  display: block;
+  color: #333;
+  border-bottom: 2px solid transparent;
+  text-decoration: none;
+  padding: 8px;
+}
+.singer-tab-item a.router-link-exact-active {
+  border-bottom-color: #000;
+}
+</style>
diff --git a/src/router/index.ts b/src/router/index.ts
index da79df7c11..5c0fc9f047 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,12 +5,17 @@ import {
   RouteRecordRaw,
 } from "vue-router";
 import Home from "../views/Home.vue";
+import SingerHome from "../views/SingerHome.vue";
 
 const routes: Array<RouteRecordRaw> = [
   {
     path: "/home",
     component: Home,
   },
+  {
+    path: "/singer-home",
+    component: SingerHome,
+  },
 ];
 
 const router = createRouter({
diff --git a/src/views/Home.vue b/src/views/Home.vue
index a8e0f1c69c..d62a946b48 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,4 +1,5 @@
 <template>
+  <singer-tab />
   <menu-bar />
 
   <q-layout reveal elevated container class="layout-container">
@@ -174,6 +175,7 @@ import CharacterOrderDialog from "@/components/CharacterOrderDialog.vue";
 import AcceptRetrieveTelemetryDialog from "@/components/AcceptRetrieveTelemetryDialog.vue";
 import AcceptTermsDialog from "@/components/AcceptTermsDialog.vue";
 import DictionaryManageDialog from "@/components/DictionaryManageDialog.vue";
+import SingerTab from "@/components/SingerTab.vue";
 import { AudioItem, EngineState } from "@/store/type";
 import { QResizeObserver, useQuasar } from "quasar";
 import path from "path";
@@ -204,6 +206,7 @@ export default defineComponent({
     AcceptRetrieveTelemetryDialog,
     AcceptTermsDialog,
     DictionaryManageDialog,
+    SingerTab,
   },
 
   setup() {
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
new file mode 100644
index 0000000000..97d7e746b4
--- /dev/null
+++ b/src/views/SingerHome.vue
@@ -0,0 +1,40 @@
+<template>
+  <singer-tab />
+  <p>Singer Home</p>
+</template>
+
+<script lang="ts">
+import {
+  //computed,
+  defineComponent,
+  //onBeforeUpdate,
+  //onMounted,
+  //ref,
+  //watch,
+} from "vue";
+// import { useStore } from "@/store";
+// import { QResizeObserver, useQuasar } from "quasar";
+// import path from "path";
+
+import SingerTab from "@/components/SingerTab.vue";
+
+export default defineComponent({
+  name: "SingerHome",
+  components: { SingerTab },
+
+  setup() {
+    //const store = useStore();
+    //const $q = useQuasar();
+    return null;
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.layout-container {
+  min-height: calc(100vh - #{vars.$menubar-height});
+}
+</style>

From 57a62f1afb5f3bc4b06cf5c65b946f0c1fd7e610 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 10 Oct 2022 23:09:38 +0900
Subject: [PATCH 02/59] =?UTF-8?q?project-s:=20StoreState=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=20(#970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 歌声合成用のStoreStateを追加

* 楽譜データの名前をScoreにして型をtype.tsに移動

* PhraseをRenderPhraseに、PhraseのnotesをrenderNotesに変更
---
 src/store/index.ts            |  2 ++
 src/store/singing.ts          |  8 +++++++
 src/store/type.ts             | 42 +++++++++++++++++++++++++++++++++++
 tests/unit/store/Vuex.spec.ts |  3 +++
 4 files changed, 55 insertions(+)
 create mode 100644 src/store/singing.ts

diff --git a/src/store/index.ts b/src/store/index.ts
index 00dc25250a..1ec3bd6ce7 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -17,6 +17,7 @@ import {
   audioCommandStoreState,
   getCharacterInfo,
 } from "./audio";
+import { singingStoreState } from "./singing";
 import { projectStoreState, projectStore } from "./project";
 import { uiStoreState, uiStore } from "./ui";
 import { settingStoreState, settingStore } from "./setting";
@@ -298,6 +299,7 @@ export const store = createStore<State, AllGetters, AllActions, AllMutations>({
   state: {
     ...uiStoreState,
     ...audioStoreState,
+    ...singingStoreState,
     ...commandStoreState,
     ...projectStoreState,
     ...settingStoreState,
diff --git a/src/store/singing.ts b/src/store/singing.ts
new file mode 100644
index 0000000000..da8e395155
--- /dev/null
+++ b/src/store/singing.ts
@@ -0,0 +1,8 @@
+import { SingingStoreState } from "./type";
+
+export const singingStoreState: SingingStoreState = {
+  engineId: undefined,
+  styleId: undefined,
+  score: undefined,
+  renderPhrases: [],
+};
diff --git a/src/store/type.ts b/src/store/type.ts
index a93750917d..10fc9d88bb 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -52,6 +52,36 @@ export type AudioState = {
   nowGenerating: boolean;
 };
 
+export type Tempo = {
+  position: number;
+  tempo: number;
+};
+
+export type TimeSignature = {
+  position: number;
+  beats: number;
+  beatType: number;
+};
+
+export type Note = {
+  position: number;
+  duration: number;
+  midi: number;
+  lyric: string;
+};
+
+export type Score = {
+  resolution: number;
+  tempos: Tempo[];
+  timeSignatures: TimeSignature[];
+  notes: Note[];
+};
+
+export type RenderPhrase = {
+  renderNotes: Note[];
+  query?: AudioQuery;
+};
+
 export type Command = {
   unixMillisec: number;
   undoPatches: Patch[];
@@ -659,6 +689,17 @@ export type AudioCommandStoreTypes = {
   };
 };
 
+/*
+ * Singing Store Types
+ */
+
+export type SingingStoreState = {
+  engineId?: string;
+  styleId?: number;
+  score?: Score;
+  renderPhrases: RenderPhrase[];
+};
+
 /*
  * Command Store Types
  */
@@ -1198,6 +1239,7 @@ export type ProxyStoreTypes = {
 
 export type State = AudioStoreState &
   AudioCommandStoreState &
+  SingingStoreState &
   CommandStoreState &
   IndexStoreState &
   ProjectStoreState &
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 6b5417274f..11c26decad 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -31,6 +31,7 @@ describe("store/vuex.js test", () => {
         uiLockCount: 0,
         dialogLockCount: 0,
         nowPlayingContinuously: false,
+        renderPhrases: [],
         undoCommands: [],
         redoCommands: [],
         useGpu: false,
@@ -174,6 +175,8 @@ describe("store/vuex.js test", () => {
     assert.equal(store.state.audioPlayStartPoint, 0);
     assert.equal(store.state.uiLockCount, 0);
     assert.equal(store.state.nowPlayingContinuously, false);
+    assert.isArray(store.state.renderPhrases);
+    assert.isEmpty(store.state.renderPhrases);
     assert.isArray(store.state.undoCommands);
     assert.isEmpty(store.state.undoCommands);
     assert.isArray(store.state.redoCommands);

From 64dc057d976f0af33093f836d2d02ef2e1b22409 Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Tue, 18 Oct 2022 14:03:07 +0900
Subject: [PATCH 03/59] =?UTF-8?q?project-s:=20UI=E3=82=B9=E3=82=B1?=
 =?UTF-8?q?=E3=83=AB=E3=83=88=E3=83=B3=E3=81=AE=E7=94=A8=E6=84=8F=20(#977)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* #15 要素のみの状態

* #15 project-s:storeの利用(仕掛かり)

* project-s: 各コンポーネントの調整 (#15)

* project-s: spec追加 (#15)

* project-s: Component name Note should always be multi-word の修正 (#15)

* project-s: 未使用定数などの削除(今後利用時追加) #15

Co-authored-by: Romot <romot@romotmbp16.local>
---
 package-lock.json                      |  41 ++++
 package.json                           |   1 +
 src/components/Sing/LyricInput.vue     |   0
 src/components/Sing/MenuBar.vue        | 254 +++++++++++++++++++++++++
 src/components/Sing/ScoreNote.vue      |   0
 src/components/Sing/ScorePosition.vue  |  27 +++
 src/components/Sing/ScoreSequencer.vue |  23 +++
 src/components/Sing/SingerPanel.vue    |  38 ++++
 src/components/Sing/ToolBar.vue        | 123 ++++++++++++
 src/components/SingerTab.vue           |   9 +-
 src/store/index.ts                     |   6 +-
 src/store/singing.ts                   |  18 +-
 src/store/type.ts                      |  16 +-
 src/views/SingerHome.vue               |  33 +++-
 tests/unit/store/Vuex.spec.ts          |   5 +
 15 files changed, 585 insertions(+), 9 deletions(-)
 create mode 100644 src/components/Sing/LyricInput.vue
 create mode 100644 src/components/Sing/MenuBar.vue
 create mode 100644 src/components/Sing/ScoreNote.vue
 create mode 100644 src/components/Sing/ScorePosition.vue
 create mode 100644 src/components/Sing/ScoreSequencer.vue
 create mode 100644 src/components/Sing/SingerPanel.vue
 create mode 100644 src/components/Sing/ToolBar.vue

diff --git a/package-lock.json b/package-lock.json
index c8338ac620..00b260a29c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@gtm-support/vue-gtm": "1.2.3",
         "@quasar/extras": "1.10.10",
+        "@tonejs/midi": "2.0.28",
         "ajv": "8.6.2",
         "core-js": "3.12.1",
         "dayjs": "1.10.7",
@@ -2870,6 +2871,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/@tonejs/midi": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/@tonejs/midi/-/midi-2.0.28.tgz",
+      "integrity": "sha512-RII6YpInPsOZ5t3Si/20QKpNqB1lZ2OCFJSOzJxz38YdY/3zqDr3uaml4JuCWkdixuPqP1/TBnXzhQ39csyoVg==",
+      "dependencies": {
+        "array-flatten": "^3.0.0",
+        "midi-file": "^1.2.2"
+      }
+    },
+    "node_modules/@tonejs/midi/node_modules/array-flatten": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
+      "integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
+    },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -16878,6 +16893,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/midi-file": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/midi-file/-/midi-file-1.2.3.tgz",
+      "integrity": "sha512-JsOv9cajkVkR1gbL9Jvplz6X4lPuyVfcci0kSLzXZ2WKs7TJF72m9U5rmp45/H/1As+96dXY8xgvNLiIfGOU4w=="
+    },
     "node_modules/miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
@@ -29595,6 +29615,22 @@
         "defer-to-connect": "^1.0.1"
       }
     },
+    "@tonejs/midi": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/@tonejs/midi/-/midi-2.0.28.tgz",
+      "integrity": "sha512-RII6YpInPsOZ5t3Si/20QKpNqB1lZ2OCFJSOzJxz38YdY/3zqDr3uaml4JuCWkdixuPqP1/TBnXzhQ39csyoVg==",
+      "requires": {
+        "array-flatten": "^3.0.0",
+        "midi-file": "^1.2.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
+          "integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
+        }
+      }
+    },
     "@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -40696,6 +40732,11 @@
         "to-regex": "^3.0.2"
       }
     },
+    "midi-file": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/midi-file/-/midi-file-1.2.3.tgz",
+      "integrity": "sha512-JsOv9cajkVkR1gbL9Jvplz6X4lPuyVfcci0kSLzXZ2WKs7TJF72m9U5rmp45/H/1As+96dXY8xgvNLiIfGOU4w=="
+    },
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
diff --git a/package.json b/package.json
index 8c5561f344..3bf04b9ee7 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   "dependencies": {
     "@gtm-support/vue-gtm": "1.2.3",
     "@quasar/extras": "1.10.10",
+    "@tonejs/midi": "2.0.28",
     "ajv": "8.6.2",
     "core-js": "3.12.1",
     "dayjs": "1.10.7",
diff --git a/src/components/Sing/LyricInput.vue b/src/components/Sing/LyricInput.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/components/Sing/MenuBar.vue b/src/components/Sing/MenuBar.vue
new file mode 100644
index 0000000000..5bcfb54810
--- /dev/null
+++ b/src/components/Sing/MenuBar.vue
@@ -0,0 +1,254 @@
+<template>
+  <q-bar class="bg-background q-pa-none relative-position">
+    <menu-button
+      v-for="(root, index) of menudata"
+      :key="index"
+      :menudata="root"
+      v-model:selected="subMenuOpenFlags[index]"
+      :disable="menubarLocked"
+      @mouseover="reassignSubMenuOpen(index)"
+      @mouseleave="
+        root.type === 'button' ? (subMenuOpenFlags[index] = false) : undefined
+      "
+    />
+  </q-bar>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, computed, ComputedRef } from "vue";
+import { useStore } from "@/store";
+import MenuButton from "@/components/MenuButton.vue";
+import { HotkeyAction, HotkeyReturnType } from "@/type/preload";
+import { setHotkeyFunctions } from "@/store/setting";
+
+type SingMenuItemBase<T extends string> = {
+  type: T;
+  label?: string;
+};
+
+export type MenuItemSeparator = SingMenuItemBase<"separator">;
+
+export type MenuItemRoot = SingMenuItemBase<"root"> & {
+  onClick: () => void;
+  subMenu: MenuItemData[];
+  icon?: string;
+};
+
+export type MenuItemButton = SingMenuItemBase<"button"> & {
+  onClick: () => void;
+  icon?: string;
+};
+
+export type MenuItemCheckbox = SingMenuItemBase<"checkbox"> & {
+  checked: ComputedRef<boolean>;
+  onClick: () => void;
+};
+
+export type MenuItemData =
+  | MenuItemSeparator
+  | MenuItemRoot
+  | MenuItemButton
+  | MenuItemCheckbox;
+
+export type MenuItemType = MenuItemData["type"];
+
+export default defineComponent({
+  name: "SingMenuBar",
+
+  components: {
+    MenuButton,
+  },
+
+  setup() {
+    const store = useStore();
+    const currentVersion = ref("");
+    window.electron.getAppInfos().then((obj) => {
+      currentVersion.value = obj.version;
+    });
+    const isFullscreen = computed(() => store.getters.IS_FULLSCREEN);
+    const menubarLocked = false; // computed(() => store.getters.IS_SING_MENUBAR_LOCKED);
+
+    const createNewSingProject = async () => {
+      return null;
+      // await store.dispatch("CREATE_NEW_SING_PROJECT", {});
+    };
+
+    const openSingProject = async () => {
+      return null;
+      // await store.dispatch("OPEN_SING_PROJECT", {});
+    };
+
+    const saveSingProject = async () => {
+      return null;
+      // await store.dispatch("SAVE_SING_PROJECT", {});
+    };
+
+    const saveAsSingProject = async () => {
+      return null;
+      // await store.dispatch("SAVE_AS_SING_PROJECT", {});
+    };
+
+    const importMidiFile = async () => {
+      return null;
+      // await store.dispatch("IMPORT_MIDI_FILE", {});
+    };
+
+    const importMusicXMLFile = async () => {
+      return null;
+      // await store.dispatch("IMPORT_MUSICXML_FILE", {});
+    };
+
+    const exportSingDataAsWaveFile = async () => {
+      return null;
+      // await store.dispatch("EXPORT_SING_DATA_AS_WAVE_FILE", {});
+    };
+
+    const openHelpDialog = () => {
+      store.dispatch("IS_HELP_DIALOG_OPEN", {
+        isHelpDialogOpen: true,
+      });
+    };
+
+    const closeAllDialog = () => {
+      return null;
+    };
+
+    const menudata = ref<MenuItemData[]>([
+      {
+        type: "root",
+        label: "ファイル",
+        onClick: () => {
+          closeAllDialog();
+        },
+        subMenu: [
+          {
+            type: "button",
+            label: "新規",
+            onClick: () => {
+              createNewSingProject();
+            },
+          },
+          {
+            type: "button",
+            label: "開く",
+            onClick: () => {
+              openSingProject();
+            },
+          },
+          {
+            type: "button",
+            label: "保存",
+            onClick: () => {
+              saveSingProject();
+            },
+          },
+          {
+            type: "button",
+            label: "別名で保存",
+            onClick: () => {
+              saveAsSingProject();
+            },
+          },
+          { type: "separator" },
+          {
+            type: "button",
+            label: "MIDI読み込み",
+            onClick: () => {
+              importMidiFile();
+            },
+          },
+          {
+            type: "button",
+            label: "MusicXML読み込み",
+            onClick: () => {
+              importMusicXMLFile();
+            },
+          },
+          { type: "separator" },
+          {
+            type: "button",
+            label: "音声を出力",
+            onClick: () => {
+              exportSingDataAsWaveFile();
+            },
+          },
+        ],
+      },
+      {
+        type: "button",
+        label: "ヘルプ",
+        onClick: () => {
+          if (store.state.isHelpDialogOpen) closeAllDialog();
+          else {
+            closeAllDialog();
+            openHelpDialog();
+          }
+        },
+      },
+    ]);
+
+    const subMenuOpenFlags = ref(
+      [...Array(menudata.value.length)].map(() => false)
+    );
+
+    const reassignSubMenuOpen = (idx: number) => {
+      if (subMenuOpenFlags.value[idx]) return;
+      if (subMenuOpenFlags.value.find((x) => x)) {
+        const arr = [...Array(menudata.value.length)].map(() => false);
+        arr[idx] = true;
+        subMenuOpenFlags.value = arr;
+      }
+    };
+
+    const hotkeyMap = new Map<HotkeyAction, () => HotkeyReturnType>([
+      // NOTE: 初期設定なし
+      // ["新規", createNewSingProject],
+    ]);
+
+    setHotkeyFunctions(hotkeyMap);
+
+    return {
+      currentVersion,
+      isFullscreen,
+      menubarLocked,
+      subMenuOpenFlags,
+      reassignSubMenuOpen,
+      menudata,
+    };
+  },
+});
+</script>
+
+<style lang="scss">
+@use '@/styles/colors' as colors;
+
+.active-menu {
+  background-color: rgba(colors.$primary-rgb, 0.3) !important;
+}
+</style>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.q-bar {
+  align-items: center;
+  min-height: vars.$menubar-height;
+  -webkit-app-region: drag;
+  > .q-btn {
+    margin-left: 0;
+    -webkit-app-region: no-drag;
+  }
+}
+
+.window-logo {
+  height: vars.$menubar-height;
+}
+
+.window-title {
+  height: vars.$menubar-height;
+  margin-right: 10%;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+</style>
diff --git a/src/components/Sing/ScoreNote.vue b/src/components/Sing/ScoreNote.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/components/Sing/ScorePosition.vue b/src/components/Sing/ScorePosition.vue
new file mode 100644
index 0000000000..ef210f0c05
--- /dev/null
+++ b/src/components/Sing/ScorePosition.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="sing-score-position">シーケンサ上ツールバー</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "SingScorePosition",
+
+  setup() {
+    return null;
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.sing-score-position {
+  background: colors.$background;
+  border-bottom: 1px solid #ccc;
+  height: 32px;
+  width: 100%;
+}
+</style>
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
new file mode 100644
index 0000000000..93f6c3f328
--- /dev/null
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -0,0 +1,23 @@
+<template>
+  <div class="score-sequencer">
+    <div class="score-sequencer-keys" />
+    シーケンサ
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "SingScoreSequencer",
+
+  setup() {
+    return null;
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+</style>
diff --git a/src/components/Sing/SingerPanel.vue b/src/components/Sing/SingerPanel.vue
new file mode 100644
index 0000000000..54f8721198
--- /dev/null
+++ b/src/components/Sing/SingerPanel.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="sing-singer-panel" v-bind:class="{ hide: !isShowSinger }">
+    シンガーの表示
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from "vue";
+import { useStore } from "@/store";
+
+export default defineComponent({
+  name: "SingSingerPanel",
+
+  setup() {
+    const store = useStore();
+    const isShowSinger = computed(() => store.state.isShowSinger);
+    return {
+      isShowSinger,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.sing-singer-panel {
+  background: colors.$background;
+  border-right: 1px solid #ccc;
+  height: 100%;
+  width: 200px;
+
+  &.hide {
+    display: none;
+  }
+}
+</style>
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
new file mode 100644
index 0000000000..5e1aca111d
--- /dev/null
+++ b/src/components/Sing/ToolBar.vue
@@ -0,0 +1,123 @@
+<template>
+  <div class="sing-toolbar">
+    <div
+      class="singer-panel-toggler"
+      v-bind:class="{ active: isShowSinger }"
+      @click="toggleShowSinger"
+    >
+      <div class="singer-avatar" />
+      <!-- <img src="" class="singer-avatar" /> -->
+    </div>
+    <div class="sing-player">
+      <button type="button" class="sing-button-temp">戻る</button>
+      <button type="button" class="sing-button-temp">再生</button>
+      <div class="sing-player-position">00:00</div>
+      <input type="number" value="120" class="sing-bpm" />
+      <input type="number" value="4" class="sing-tempo" />/
+      <input type="number" value="4" class="sing-tempo" />
+    </div>
+    <div class="sing-setting">
+      <input type="range" min="0" max="100" class="sing-volume" />
+      <select class="sing-snap">
+        <option>1/16</option>
+      </select>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from "vue";
+import { useStore } from "@/store";
+
+export default defineComponent({
+  name: "SingToolBar",
+
+  setup() {
+    const store = useStore();
+    const isShowSinger = computed(() => store.state.isShowSinger);
+    const toggleShowSinger = () => {
+      store.dispatch("SET_SHOW_SINGER", {
+        isShowSinger: !isShowSinger.value,
+      });
+    };
+    return {
+      isShowSinger,
+      toggleShowSinger,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.sing-toolbar {
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  align-items: center;
+  display: flex;
+  padding: 8px 16px;
+  width: 100%;
+}
+.singer-panel-toggler {
+  border: 2px solid #777;
+  border-radius: 50%;
+  display: block;
+  height: 48px;
+  margin-right: auto;
+  overflow: hidden;
+  width: 48px;
+
+  &:hover {
+    cursor: pointer;
+  }
+
+  &.active {
+    border-color: red;
+  }
+}
+
+.singer-avatar {
+  background: #777;
+  display: block;
+  object-fit: cover;
+  height: 100%;
+  width: 100%;
+}
+
+.sing-player {
+  align-items: center;
+  display: flex;
+}
+
+.sing-button-temp {
+  margin: 0 4px;
+}
+
+.sing-bpm {
+  margin: 0 4px;
+  width: 56px;
+}
+
+.sing-tempo {
+  margin: 0 4px;
+  width: 32px;
+}
+
+.sing-player-position {
+  font-size: 18px;
+  margin: 0 4px;
+}
+
+.sing-setting {
+  align-items: center;
+  display: flex;
+  margin-left: auto;
+}
+
+.sing-volume {
+  margin-right: 4px;
+  width: 72px;
+}
+</style>
diff --git a/src/components/SingerTab.vue b/src/components/SingerTab.vue
index 2bac5c6a82..ae3e00ade0 100644
--- a/src/components/SingerTab.vue
+++ b/src/components/SingerTab.vue
@@ -27,20 +27,23 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
 .singer-tab {
-  border-bottom: 1px solid #ccc;
+  border-bottom: 1px solid colors.$splitter;
   display: flex;
   list-style: none;
+  margin-bottom: 0;
   padding-left: 0;
 }
 .singer-tab a {
   display: block;
-  color: #333;
+  color: colors.$display;
   border-bottom: 2px solid transparent;
   text-decoration: none;
   padding: 8px;
 }
 .singer-tab-item a.router-link-exact-active {
-  border-bottom-color: #000;
+  border-bottom-color: colors.$primary;
 }
 </style>
diff --git a/src/store/index.ts b/src/store/index.ts
index 1ec3bd6ce7..7071b32a9a 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -17,7 +17,7 @@ import {
   audioCommandStoreState,
   getCharacterInfo,
 } from "./audio";
-import { singingStoreState } from "./singing";
+import { singingStoreState, singingStore } from "./singing";
 import { projectStoreState, projectStore } from "./project";
 import { uiStoreState, uiStore } from "./ui";
 import { settingStoreState, settingStore } from "./setting";
@@ -308,6 +308,7 @@ export const store = createStore<State, AllGetters, AllActions, AllMutations>({
     ...presetStoreState,
     ...dictionaryStoreState,
     ...proxyStoreState,
+    ...singingStoreState,
   },
 
   getters: {
@@ -321,6 +322,7 @@ export const store = createStore<State, AllGetters, AllActions, AllMutations>({
     ...audioCommandStore.getters,
     ...indexStore.getters,
     ...proxyStore.getters,
+    ...singingStore.getters,
   },
 
   mutations: {
@@ -334,6 +336,7 @@ export const store = createStore<State, AllGetters, AllActions, AllMutations>({
     ...dictionaryStore.mutations,
     ...indexStore.mutations,
     ...proxyStore.mutations,
+    ...singingStore.mutations,
   },
 
   actions: {
@@ -347,6 +350,7 @@ export const store = createStore<State, AllGetters, AllActions, AllMutations>({
     ...dictionaryStore.actions,
     ...indexStore.actions,
     ...proxyStore.actions,
+    ...singingStore.actions,
   },
   strict: process.env.NODE_ENV !== "production",
 });
diff --git a/src/store/singing.ts b/src/store/singing.ts
index da8e395155..e422bcd370 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,8 +1,24 @@
-import { SingingStoreState } from "./type";
+import { SingingStoreState, SingingStoreTypes } from "./type";
+import { createPartialStore } from "./vuex";
 
 export const singingStoreState: SingingStoreState = {
   engineId: undefined,
   styleId: undefined,
   score: undefined,
   renderPhrases: [],
+  // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
+  isShowSinger: true,
 };
+
+export const singingStore = createPartialStore<SingingStoreTypes>({
+  SET_SHOW_SINGER: {
+    mutation(state, { isShowSinger }: { isShowSinger: boolean }) {
+      state.isShowSinger = isShowSinger;
+    },
+    async action({ commit }, { isShowSinger }) {
+      commit("SET_SHOW_SINGER", {
+        isShowSinger,
+      });
+    },
+  },
+});
diff --git a/src/store/type.ts b/src/store/type.ts
index 10fc9d88bb..15f9f373bc 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -698,6 +698,16 @@ export type SingingStoreState = {
   styleId?: number;
   score?: Score;
   renderPhrases: RenderPhrase[];
+  // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
+  isShowSinger: boolean;
+  // NOTE: オーディオ再生はボイスと同様もしくは拡張して使う？
+};
+
+export type SingingStoreTypes = {
+  SET_SHOW_SINGER: {
+    mutation: { isShowSinger: boolean };
+    action(payload: { isShowSinger: boolean }): void;
+  };
 };
 
 /*
@@ -1247,7 +1257,8 @@ export type State = AudioStoreState &
   UiStoreState &
   PresetStoreState &
   DictionaryStoreState &
-  ProxyStoreState;
+  ProxyStoreState &
+  SingingStoreState;
 
 type AllStoreTypes = AudioStoreTypes &
   AudioCommandStoreTypes &
@@ -1258,7 +1269,8 @@ type AllStoreTypes = AudioStoreTypes &
   UiStoreTypes &
   PresetStoreTypes &
   DictionaryStoreTypes &
-  ProxyStoreTypes;
+  ProxyStoreTypes &
+  SingingStoreTypes;
 
 export type AllGetters = StoreType<AllStoreTypes, "getter">;
 export type AllMutations = StoreType<AllStoreTypes, "mutation">;
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index 97d7e746b4..bb8b99ed19 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -1,6 +1,14 @@
 <template>
   <singer-tab />
-  <p>Singer Home</p>
+  <menu-bar />
+  <tool-bar />
+  <div class="sing-main">
+    <singer-panel />
+    <div class="sing-editor">
+      <score-position />
+      <score-sequencer />
+    </div>
+  </div>
 </template>
 
 <script lang="ts">
@@ -17,10 +25,22 @@ import {
 // import path from "path";
 
 import SingerTab from "@/components/SingerTab.vue";
+import MenuBar from "@/components/Sing/MenuBar.vue";
+import ToolBar from "@/components/Sing/ToolBar.vue";
+import SingerPanel from "@/components/Sing/SingerPanel.vue";
+import ScoreSequencer from "@/components/Sing/ScoreSequencer.vue";
+import ScorePosition from "@/components/Sing/ScorePosition.vue";
 
 export default defineComponent({
   name: "SingerHome",
-  components: { SingerTab },
+  components: {
+    SingerTab,
+    MenuBar,
+    ToolBar,
+    SingerPanel,
+    ScoreSequencer,
+    ScorePosition,
+  },
 
   setup() {
     //const store = useStore();
@@ -37,4 +57,13 @@ export default defineComponent({
 .layout-container {
   min-height: calc(100vh - #{vars.$menubar-height});
 }
+.sing-main {
+  display: flex;
+  height: 100vh;
+  width: 100vw;
+}
+
+.sing-editor {
+  width: 100%;
+}
 </style>
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 11c26decad..cbd8c62647 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -11,6 +11,7 @@ import { presetStore } from "@/store/preset";
 import { assert } from "chai";
 import { proxyStore } from "@/store/proxy";
 import { dictionaryStore } from "@/store/dictionary";
+import { singingStore } from "@/store/singing";
 const isDevelopment = process.env.NODE_ENV == "development";
 // TODO: Swap external files to Mock
 
@@ -117,6 +118,7 @@ describe("store/vuex.js test", () => {
         confirmedTips: {
           tweakableSliderByScroll: false,
         },
+        isShowSinger: true,
       },
       getters: {
         ...uiStore.getters,
@@ -129,6 +131,7 @@ describe("store/vuex.js test", () => {
         ...presetStore.getters,
         ...proxyStore.getters,
         ...dictionaryStore.getters,
+        ...singingStore.getters,
       },
       mutations: {
         ...uiStore.mutations,
@@ -141,6 +144,7 @@ describe("store/vuex.js test", () => {
         ...presetStore.mutations,
         ...proxyStore.mutations,
         ...dictionaryStore.mutations,
+        ...singingStore.mutations,
       },
       actions: {
         ...uiStore.actions,
@@ -153,6 +157,7 @@ describe("store/vuex.js test", () => {
         ...presetStore.actions,
         ...proxyStore.actions,
         ...dictionaryStore.actions,
+        ...singingStore.actions,
       },
       plugins: isDevelopment ? [createLogger()] : undefined,
       strict: process.env.NODE_ENV !== "production",

From dcb4cd11bb30ae68293098694ce7469cf15b05d5 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Wed, 26 Oct 2022 17:59:47 +0900
Subject: [PATCH 04/59] =?UTF-8?q?project-s:=20=E5=88=9D=E6=9C=9F=E5=8C=96?=
 =?UTF-8?q?=E3=81=A8=E3=82=B7=E3=83=B3=E3=82=AC=E3=83=BC=E3=83=BB=E6=A5=BD?=
 =?UTF-8?q?=E8=AD=9C=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8Baction/mu?=
 =?UTF-8?q?tation=E3=82=92=E8=BF=BD=E5=8A=A0=20(#988)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 初期化とシンガー・楽譜を設定するaction/mutationを追加
---
 src/store/singing.ts     | 72 +++++++++++++++++++++++++++++++++++++++-
 src/store/type.ts        | 14 ++++++++
 src/views/SingerHome.vue | 24 ++++++++++++--
 3 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/src/store/singing.ts b/src/store/singing.ts
index e422bcd370..dea9014254 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,4 +1,4 @@
-import { SingingStoreState, SingingStoreTypes } from "./type";
+import { Score, SingingStoreState, SingingStoreTypes } from "./type";
 import { createPartialStore } from "./vuex";
 
 export const singingStoreState: SingingStoreState = {
@@ -21,4 +21,74 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       });
     },
   },
+
+  SET_SINGER: {
+    mutation(
+      state,
+      { engineId, styleId }: { engineId: string; styleId: number }
+    ) {
+      state.engineId = engineId;
+      state.styleId = styleId;
+    },
+    async action(
+      { state, getters, dispatch, commit },
+      payload: { engineId?: string; styleId?: number }
+    ) {
+      if (state.defaultStyleIds == undefined)
+        throw new Error("state.defaultStyleIds == undefined");
+      if (getters.USER_ORDERED_CHARACTER_INFOS == undefined)
+        throw new Error("state.characterInfos == undefined");
+      const userOrderedCharacterInfos = getters.USER_ORDERED_CHARACTER_INFOS;
+
+      const engineId = payload.engineId ?? state.engineIds[0];
+
+      // FIXME: engineIdも含めて探査する
+      const styleId =
+        payload.styleId ??
+        state.defaultStyleIds[
+          state.defaultStyleIds.findIndex(
+            (x) =>
+              x.speakerUuid === userOrderedCharacterInfos[0].metas.speakerUuid // FIXME: defaultStyleIds内にspeakerUuidがない場合がある
+          )
+        ].defaultStyleId;
+
+      try {
+        // 指定されたstyleIdに対して、エンジン側の初期化を行う
+        const isInitialized = await dispatch("IS_INITIALIZED_ENGINE_SPEAKER", {
+          engineId,
+          styleId,
+        });
+        if (!isInitialized) {
+          await dispatch("INITIALIZE_ENGINE_SPEAKER", {
+            engineId,
+            styleId,
+          });
+        }
+      } finally {
+        commit("SET_SINGER", { engineId, styleId });
+      }
+    },
+  },
+
+  GET_DEFAULT_SCORE: {
+    async action() {
+      const score: Score = {
+        resolution: 480,
+        // テンポの初期値は120で良いでしょうか？
+        tempos: [{ position: 0, tempo: 120 }],
+        timeSignatures: [{ position: 0, beats: 4, beatType: 4 }],
+        notes: [],
+      };
+      return score;
+    },
+  },
+
+  SET_SCORE: {
+    mutation(state, { score }: { score: Score }) {
+      state.score = score;
+    },
+    async action({ commit }, { score }: { score: Score }) {
+      commit("SET_SCORE", { score });
+    },
+  },
 });
diff --git a/src/store/type.ts b/src/store/type.ts
index 15f9f373bc..53d2fa1b48 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -708,6 +708,20 @@ export type SingingStoreTypes = {
     mutation: { isShowSinger: boolean };
     action(payload: { isShowSinger: boolean }): void;
   };
+
+  SET_SINGER: {
+    mutation: { engineId: string; styleId: number };
+    action(payload: { engineId?: string; styleId?: number }): void;
+  };
+
+  GET_DEFAULT_SCORE: {
+    action(): Promise<Score>;
+  };
+
+  SET_SCORE: {
+    mutation: { score: Score };
+    action(payload: { score: Score }): void;
+  };
 };
 
 /*
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index bb8b99ed19..e199e7dd8f 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -16,11 +16,11 @@ import {
   //computed,
   defineComponent,
   //onBeforeUpdate,
-  //onMounted,
+  onMounted,
   //ref,
   //watch,
 } from "vue";
-// import { useStore } from "@/store";
+import { useStore } from "@/store";
 // import { QResizeObserver, useQuasar } from "quasar";
 // import path from "path";
 
@@ -43,8 +43,26 @@ export default defineComponent({
   },
 
   setup() {
-    //const store = useStore();
+    const store = useStore();
     //const $q = useQuasar();
+
+    // 歌声合成エディターの初期化
+    onMounted(async () => {
+      await store.dispatch("SET_SINGER", {});
+
+      const score = await store.dispatch("GET_DEFAULT_SCORE");
+
+      // 実装時の確認用です TODO: 必要なくなったら削除
+      score.notes = [
+        { position: 0, duration: 480, midi: 60, lyric: "ら" },
+        { position: 480, duration: 480, midi: 62, lyric: "ら" },
+        { position: 960, duration: 480, midi: 64, lyric: "ら" },
+        { position: 1440, duration: 480, midi: 65, lyric: "ら" },
+        { position: 1920, duration: 1920, midi: 67, lyric: "ら" },
+      ];
+
+      await store.dispatch("SET_SCORE", { score });
+    });
     return null;
   },
 });

From f40a5421c5f641b60fc497d36ec6079ec29efbf8 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 3 Nov 2022 14:47:22 +0900
Subject: [PATCH 05/59] =?UTF-8?q?project-s:=20=E3=82=B7=E3=83=B3=E3=82=AC?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E8=A1=A8=E7=A4=BA=E3=83=BB=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=99=E3=82=8BUI=E3=82=92=E8=BF=BD=E5=8A=A0=20(#999)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* シンガーを表示・設定するUIを追加

* undefinedでエラーになる箇所を修正

* オプショナルチェーンの部分を修正、CharacterMenuButtonのプロパティとイベントを削除
---
 src/components/Sing/CharacterMenuButton.vue | 300 ++++++++++++++++++++
 src/components/Sing/SingerPanel.vue         |  75 ++++-
 src/components/Sing/ToolBar.vue             |  33 ++-
 3 files changed, 403 insertions(+), 5 deletions(-)
 create mode 100644 src/components/Sing/CharacterMenuButton.vue

diff --git a/src/components/Sing/CharacterMenuButton.vue b/src/components/Sing/CharacterMenuButton.vue
new file mode 100644
index 0000000000..d7f2d4c31d
--- /dev/null
+++ b/src/components/Sing/CharacterMenuButton.vue
@@ -0,0 +1,300 @@
+<template>
+  <q-btn flat class="q-pa-none">
+    <slot />
+    <q-menu
+      class="character-menu"
+      transition-show="none"
+      transition-hide="none"
+      touch-position
+    >
+      <q-list>
+        <q-item
+          v-for="(characterInfo, characterIndex) in userOrderedCharacterInfos"
+          :key="characterIndex"
+          class="q-pa-none"
+        >
+          <q-btn-group flat class="col full-width">
+            <q-btn
+              flat
+              no-caps
+              v-close-popup
+              class="col-grow"
+              :class="
+                characterInfo.metas.speakerUuid === selectedSpeakerUuid &&
+                'selected-character-item'
+              "
+              @click="
+                changeStyleId(
+                  characterInfo.metas.speakerUuid,
+                  getDefaultStyle(characterInfo.metas.speakerUuid).styleId
+                )
+              "
+              @mouseover="reassignSubMenuOpen(-1)"
+              @mouseleave="reassignSubMenuOpen.cancel()"
+            >
+              <q-avatar rounded size="2rem" class="q-mr-md">
+                <q-img
+                  no-spinner
+                  no-transition
+                  :ratio="1"
+                  :src="
+                    getDefaultStyle(characterInfo.metas.speakerUuid).iconPath
+                  "
+                />
+                <q-avatar
+                  class="engine-icon"
+                  rounded
+                  v-if="
+                    isMultipleEngine && characterInfo.metas.styles.length < 2
+                  "
+                >
+                  <img
+                    :src="
+                      engineIcons[
+                        getDefaultStyle(characterInfo.metas.speakerUuid)
+                          .engineId
+                      ]
+                    "
+                  />
+                </q-avatar>
+              </q-avatar>
+              <div>{{ characterInfo.metas.speakerName }}</div>
+            </q-btn>
+
+            <!-- スタイルが2つ以上あるものだけ、スタイル選択ボタンを表示する-->
+            <template v-if="characterInfo.metas.styles.length >= 2">
+              <q-separator vertical />
+
+              <div
+                class="flex items-center q-px-sm q-py-none cursor-pointer"
+                :class="
+                  subMenuOpenFlags[characterIndex] && 'opened-character-item'
+                "
+                @mouseover="reassignSubMenuOpen(characterIndex)"
+                @mouseleave="reassignSubMenuOpen.cancel()"
+              >
+                <q-icon name="keyboard_arrow_right" color="grey-6" size="sm" />
+
+                <q-menu
+                  no-parent-event
+                  anchor="top end"
+                  self="top start"
+                  transition-show="none"
+                  transition-hide="none"
+                  class="character-menu"
+                  v-model="subMenuOpenFlags[characterIndex]"
+                >
+                  <q-list>
+                    <q-item
+                      v-for="(style, styleIndex) in characterInfo.metas.styles"
+                      :key="styleIndex"
+                      clickable
+                      v-close-popup
+                      active-class="selected-character-item"
+                      :active="style.styleId === selectedStyleId"
+                      @click="
+                        changeStyleId(
+                          characterInfo.metas.speakerUuid,
+                          style.styleId
+                        )
+                      "
+                    >
+                      <q-avatar rounded size="2rem" class="q-mr-md">
+                        <q-img
+                          no-spinner
+                          no-transition
+                          :ratio="1"
+                          :src="characterInfo.metas.styles[styleIndex].iconPath"
+                        />
+                        <q-avatar
+                          rounded
+                          class="engine-icon"
+                          v-if="isMultipleEngine"
+                        >
+                          <img
+                            :src="
+                              engineIcons[
+                                characterInfo.metas.styles[styleIndex].engineId
+                              ]
+                            "
+                          />
+                        </q-avatar>
+                      </q-avatar>
+                      <q-item-section v-if="style.styleName"
+                        >{{ characterInfo.metas.speakerName }} ({{
+                          style.styleName
+                        }})</q-item-section
+                      >
+                      <q-item-section v-else>{{
+                        characterInfo.metas.speakerName
+                      }}</q-item-section>
+                    </q-item>
+                  </q-list>
+                </q-menu>
+              </div>
+            </template>
+          </q-btn-group>
+        </q-item>
+      </q-list>
+    </q-menu>
+  </q-btn>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed, ref } from "vue";
+import { debounce } from "quasar";
+import { useStore } from "@/store";
+import { base64ImageToUri } from "@/helpers/imageHelper";
+
+export default defineComponent({
+  name: "CharacterMenuButton",
+
+  setup() {
+    const store = useStore();
+
+    const userOrderedCharacterInfos = computed(
+      () => store.getters.USER_ORDERED_CHARACTER_INFOS
+    );
+
+    const subMenuOpenFlags = ref(
+      [...Array(userOrderedCharacterInfos.value?.length)].map(() => false)
+    );
+
+    const reassignSubMenuOpen = debounce((idx: number) => {
+      if (subMenuOpenFlags.value[idx]) return;
+      const arr = [...Array(userOrderedCharacterInfos.value?.length)].map(
+        () => false
+      );
+      arr[idx] = true;
+      subMenuOpenFlags.value = arr;
+    }, 100);
+
+    const changeStyleId = (speakerUuid: string, styleId: number) => {
+      const engineId = store.state.engineIds.find((_engineId) =>
+        (store.state.characterInfos[_engineId] ?? []).some(
+          (characterInfo) =>
+            characterInfo.metas.speakerUuid === speakerUuid &&
+            characterInfo.metas.styles.some(
+              (style) => style.styleId === styleId
+            )
+        )
+      );
+      if (engineId === undefined)
+        throw new Error(
+          `No engineId for target character style (speakerUuid == ${speakerUuid}, styleId == ${styleId})`
+        );
+
+      store.dispatch("SET_SINGER", { engineId, styleId });
+    };
+
+    const getDefaultStyle = (speakerUuid: string) => {
+      // FIXME: 同一キャラが複数エンジンにまたがっているとき、順番が先のエンジンが必ず選択される
+      const characterInfo = userOrderedCharacterInfos.value?.find(
+        (info) => info.metas.speakerUuid === speakerUuid
+      );
+      const defaultStyleId = store.state.defaultStyleIds.find(
+        (x) => x.speakerUuid === speakerUuid
+      )?.defaultStyleId;
+
+      return characterInfo?.metas.styles.find(
+        (style) => style.styleId === defaultStyleId
+      );
+    };
+
+    const selectedCharacterInfo = computed(() => {
+      if (
+        userOrderedCharacterInfos.value === undefined ||
+        store.state.engineId === undefined ||
+        store.state.styleId === undefined
+      )
+        return undefined;
+      return store.getters.CHARACTER_INFO(
+        store.state.engineId,
+        store.state.styleId
+      );
+    });
+
+    const selectedSpeakerUuid = computed(() => {
+      return selectedCharacterInfo.value?.metas.speakerUuid;
+    });
+
+    const selectedStyleId = computed(
+      () =>
+        selectedCharacterInfo.value?.metas.styles.find(
+          (style) =>
+            style.styleId === store.state.styleId &&
+            style.engineId === store.state.engineId
+        )?.styleId
+    );
+
+    // 複数エンジン
+    const isMultipleEngine = computed(() => store.state.engineIds.length > 1);
+
+    const engineIcons = computed(() =>
+      Object.fromEntries(
+        store.state.engineIds.map((engineId) => [
+          engineId,
+          base64ImageToUri(store.state.engineManifests[engineId].icon),
+        ])
+      )
+    );
+
+    return {
+      userOrderedCharacterInfos,
+      subMenuOpenFlags,
+      reassignSubMenuOpen,
+      changeStyleId,
+      getDefaultStyle,
+      selectedCharacterInfo,
+      selectedSpeakerUuid,
+      selectedStyleId,
+      isMultipleEngine,
+      engineIcons,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.character-name {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  padding: 1px 24px 1px 8px;
+  background-image: linear-gradient(
+    90deg,
+    rgba(colors.$background-rgb, 0.5) 0%,
+    rgba(colors.$background-rgb, 0.5) 75%,
+    transparent 100%
+  );
+  overflow-wrap: anywhere;
+}
+
+.character-menu {
+  .q-item {
+    color: colors.$display;
+  }
+  .q-btn-group {
+    > .q-btn:first-child > :deep(.q-btn__content) {
+      justify-content: flex-start;
+    }
+    > div:last-child:hover {
+      background-color: rgba(colors.$primary-rgb, 0.1);
+    }
+  }
+  .selected-character-item,
+  .opened-character-item {
+    background-color: rgba(colors.$primary-rgb, 0.2);
+  }
+  .engine-icon {
+    position: absolute;
+    width: 13px;
+    height: 13px;
+    bottom: -6px;
+    right: -6px;
+  }
+}
+</style>
diff --git a/src/components/Sing/SingerPanel.vue b/src/components/Sing/SingerPanel.vue
index 54f8721198..16c6037ed6 100644
--- a/src/components/Sing/SingerPanel.vue
+++ b/src/components/Sing/SingerPanel.vue
@@ -1,21 +1,61 @@
 <template>
   <div class="sing-singer-panel" v-bind:class="{ hide: !isShowSinger }">
-    シンガーの表示
+    <character-menu-button class="character-menu-button" :disable="uiLocked">
+      <span class="character-name">{{ characterName }}</span>
+      <div class="character-portrait-wrapper">
+        <img class="character-portrait" :src="portraitPath" />
+      </div>
+    </character-menu-button>
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent, computed } from "vue";
 import { useStore } from "@/store";
+import CharacterMenuButton from "@/components/Sing/CharacterMenuButton.vue";
 
 export default defineComponent({
   name: "SingSingerPanel",
+  components: {
+    CharacterMenuButton,
+  },
 
   setup() {
     const store = useStore();
     const isShowSinger = computed(() => store.state.isShowSinger);
+
+    const uiLocked = computed(() => store.getters.UI_LOCKED);
+
+    const userOrderedCharacterInfos = computed(
+      () => store.getters.USER_ORDERED_CHARACTER_INFOS
+    );
+
+    const characterInfo = computed(() => {
+      const engineId = store.state.engineId;
+      const styleId = store.state.styleId;
+      if (userOrderedCharacterInfos.value === undefined) return undefined;
+      if (engineId === undefined || styleId === undefined) return undefined;
+      return store.getters.CHARACTER_INFO(engineId, styleId);
+    });
+
+    const characterName = computed(() => {
+      const style = characterInfo.value?.metas.styles.find(
+        (style) => style.styleId === store.state.styleId
+      );
+      return style?.styleName
+        ? `${characterInfo.value?.metas.speakerName} (${style?.styleName})`
+        : characterInfo.value?.metas.speakerName;
+    });
+
+    const portraitPath = computed(() => characterInfo.value?.portraitPath);
+
     return {
       isShowSinger,
+      uiLocked,
+      userOrderedCharacterInfos,
+      characterInfo,
+      characterName,
+      portraitPath,
     };
   },
 });
@@ -25,6 +65,20 @@ export default defineComponent({
 @use '@/styles/variables' as vars;
 @use '@/styles/colors' as colors;
 
+.character-name {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  padding: 1px 24px 1px 8px;
+  background-image: linear-gradient(
+    90deg,
+    rgba(colors.$background-rgb, 0.5) 0%,
+    rgba(colors.$background-rgb, 0.5) 75%,
+    transparent 100%
+  );
+  overflow-wrap: anywhere;
+}
+
 .sing-singer-panel {
   background: colors.$background;
   border-right: 1px solid #ccc;
@@ -35,4 +89,23 @@ export default defineComponent({
     display: none;
   }
 }
+
+.character-portrait-wrapper {
+  display: grid;
+  justify-content: center;
+
+  .character-portrait {
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
+
+.character-menu-button {
+  height: 168px;
+  width: 100%;
+  border-bottom: 1px solid #ccc;
+  box-shadow: 0px -2px 4px -3px #ccc inset;
+  overflow: hidden;
+  border-radius: 0px;
+}
 </style>
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 5e1aca111d..396987dc35 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -5,8 +5,7 @@
       v-bind:class="{ active: isShowSinger }"
       @click="toggleShowSinger"
     >
-      <div class="singer-avatar" />
-      <!-- <img src="" class="singer-avatar" /> -->
+      <img :src="selectedStyleIconPath" class="singer-avatar" />
     </div>
     <div class="sing-player">
       <button type="button" class="sing-button-temp">戻る</button>
@@ -40,9 +39,35 @@ export default defineComponent({
         isShowSinger: !isShowSinger.value,
       });
     };
+
+    const userOrderedCharacterInfos = computed(
+      () => store.getters.USER_ORDERED_CHARACTER_INFOS
+    );
+    const selectedCharacterInfo = computed(() =>
+      userOrderedCharacterInfos.value !== undefined &&
+      store.state.engineId !== undefined &&
+      store.state.styleId !== undefined
+        ? store.getters.CHARACTER_INFO(
+            store.state.engineId,
+            store.state.styleId
+          )
+        : undefined
+    );
+    const selectedStyleIconPath = computed(
+      () =>
+        selectedCharacterInfo.value?.metas.styles.find(
+          (style) =>
+            style.styleId === store.state.styleId &&
+            style.engineId === store.state.engineId
+        )?.iconPath
+    );
+
     return {
       isShowSinger,
       toggleShowSinger,
+      userOrderedCharacterInfos,
+      selectedCharacterInfo,
+      selectedStyleIconPath,
     };
   },
 });
@@ -74,12 +99,12 @@ export default defineComponent({
   }
 
   &.active {
-    border-color: red;
+    border-color: colors.$primary;
   }
 }
 
 .singer-avatar {
-  background: #777;
+  background: colors.$background;
   display: block;
   object-fit: cover;
   height: 100%;

From 7a45861c56ee85be6871f4bb72c2d3e6ae7debd3 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 20 Nov 2022 02:13:55 +0900
Subject: [PATCH 06/59] =?UTF-8?q?project-s:=20MIDI=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=A8MusicXML=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=82=92=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=20(#1018)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* MIDIファイルをインポートする機能を追加

* MusicXMLをインポートする機能を追加

* 重複するノートやテンポ・拍子を除いてMIDIファイルをインポートするように変更

* GET_DEFAULT_SCOREからGET_EMPTY_SCOREに名前を変更

* reduceを使わない形に変更

* 関数名とテンポ・拍子の位置が変換できていなかったのを修正

* attributes要素内のsound要素も読むように修正

* タイのstopとnotations要素内のタイも読むように変更

* リファクタリングとTODOコメントの追加

* テンポを四捨五入するように変更

* MIDIインポートで一番音が高いノートのみインポートするように変更
---
 src/background.ts               |   4 +-
 src/components/Sing/MenuBar.vue |   6 +-
 src/electron/preload.ts         |   8 +-
 src/store/singing.ts            | 410 +++++++++++++++++++++++++++++++-
 src/store/type.ts               |  10 +-
 src/type/ipc.ts                 |   2 +-
 src/type/preload.ts             |   6 +-
 src/views/SingerHome.vue        |   2 +-
 8 files changed, 433 insertions(+), 15 deletions(-)

diff --git a/src/background.ts b/src/background.ts
index 6d25e93722..cf03a40f9d 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -1065,10 +1065,10 @@ ipcMainHandle("SHOW_ERROR_DIALOG", (_, { title, message }) => {
   });
 });
 
-ipcMainHandle("SHOW_IMPORT_FILE_DIALOG", (_, { title }) => {
+ipcMainHandle("SHOW_IMPORT_FILE_DIALOG", (_, { title, name, extensions }) => {
   return dialog.showOpenDialogSync(win, {
     title,
-    filters: [{ name: "Text", extensions: ["txt"] }],
+    filters: [{ name: name ?? "Text", extensions: extensions ?? ["txt"] }],
     properties: ["openFile", "createDirectory"],
   })?.[0];
 });
diff --git a/src/components/Sing/MenuBar.vue b/src/components/Sing/MenuBar.vue
index 5bcfb54810..dbc125e955 100644
--- a/src/components/Sing/MenuBar.vue
+++ b/src/components/Sing/MenuBar.vue
@@ -89,13 +89,11 @@ export default defineComponent({
     };
 
     const importMidiFile = async () => {
-      return null;
-      // await store.dispatch("IMPORT_MIDI_FILE", {});
+      await store.dispatch("IMPORT_MIDI_FILE", {});
     };
 
     const importMusicXMLFile = async () => {
-      return null;
-      // await store.dispatch("IMPORT_MUSICXML_FILE", {});
+      await store.dispatch("IMPORT_MUSICXML_FILE", {});
     };
 
     const exportSingDataAsWaveFile = async () => {
diff --git a/src/electron/preload.ts b/src/electron/preload.ts
index c67874ea5d..45c99b0b85 100644
--- a/src/electron/preload.ts
+++ b/src/electron/preload.ts
@@ -130,8 +130,12 @@ const api: Sandbox = {
     });
   },
 
-  showImportFileDialog: ({ title }) => {
-    return ipcRendererInvoke("SHOW_IMPORT_FILE_DIALOG", { title });
+  showImportFileDialog: ({ title, name, extensions }) => {
+    return ipcRendererInvoke("SHOW_IMPORT_FILE_DIALOG", {
+      title,
+      name,
+      extensions,
+    });
   },
 
   writeFile: ({ filePath, buffer }) => {
diff --git a/src/store/singing.ts b/src/store/singing.ts
index dea9014254..4932143b5a 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,5 +1,7 @@
-import { Score, SingingStoreState, SingingStoreTypes } from "./type";
+import { Note, Score, SingingStoreState, SingingStoreTypes } from "./type";
 import { createPartialStore } from "./vuex";
+import { createUILockAction } from "./ui";
+import { Midi } from "@tonejs/midi";
 
 export const singingStoreState: SingingStoreState = {
   engineId: undefined,
@@ -70,11 +72,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  GET_DEFAULT_SCORE: {
+  GET_EMPTY_SCORE: {
     async action() {
       const score: Score = {
         resolution: 480,
-        // テンポの初期値は120で良いでしょうか？
         tempos: [{ position: 0, tempo: 120 }],
         timeSignatures: [{ position: 0, beats: 4, beatType: 4 }],
         notes: [],
@@ -91,4 +92,407 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       commit("SET_SCORE", { score });
     },
   },
+
+  IMPORT_MIDI_FILE: {
+    action: createUILockAction(
+      async ({ dispatch }, { filePath }: { filePath?: string }) => {
+        if (!filePath) {
+          filePath = await window.electron.showImportFileDialog({
+            title: "MIDI読み込み",
+            name: "MIDI",
+            extensions: ["mid", "midi"],
+          });
+          if (!filePath) return;
+        }
+
+        const midiData = await window.electron.readFile({ filePath });
+        const midi = new Midi(midiData);
+
+        const score = await dispatch("GET_EMPTY_SCORE");
+
+        const convertToPosBasedOnRes = (position: number) => {
+          return Math.round(position * (score.resolution / midi.header.ppq));
+        };
+
+        const convertToDurationBasedOnRes = (
+          position: number,
+          duration: number
+        ) => {
+          let endPosition = position + duration;
+          endPosition = convertToPosBasedOnRes(endPosition);
+          position = convertToPosBasedOnRes(position);
+          return Math.max(0, endPosition - position);
+        };
+
+        const round = (value: number, digits: number) => {
+          const powerOf10 = 10 ** digits;
+          return Math.round(value * powerOf10) / powerOf10;
+        };
+
+        // TODO: UIで読み込むトラックを選択できるようにする
+        // ひとまず1トラック目のみを読み込む
+        midi.tracks[0].notes
+          .map((note) => ({
+            position: convertToPosBasedOnRes(note.ticks),
+            duration: convertToDurationBasedOnRes(
+              note.ticks,
+              note.durationTicks
+            ),
+            midi: note.midi,
+            lyric: "",
+          }))
+          .sort((a, b) => a.position - b.position)
+          .forEach((note) => {
+            // ノートの重なりを考慮して、一番音が高いノート（トップノート）のみインポートする
+            if (score.notes.length === 0) {
+              score.notes.push(note);
+              return;
+            }
+            const topNote = score.notes[score.notes.length - 1];
+            const topNoteEnd = topNote.position + topNote.duration;
+            if (note.position >= topNoteEnd) {
+              score.notes.push(note);
+              return;
+            }
+            if (note.midi > topNote.midi) {
+              score.notes.pop();
+              score.notes.push(note);
+            }
+          });
+
+        const tempos = midi.header.tempos
+          .map((tempo) => ({
+            position: convertToPosBasedOnRes(tempo.ticks),
+            tempo: round(tempo.bpm, 2),
+          }))
+          .sort((a, b) => a.position - b.position);
+
+        score.tempos = score.tempos
+          .concat(tempos)
+          .filter((value, index, array) => {
+            if (index === array.length - 1) return true;
+            return value.position !== array[index + 1].position;
+          });
+
+        const timeSignatures = midi.header.timeSignatures
+          .map((timeSignature) => ({
+            position: convertToPosBasedOnRes(timeSignature.ticks),
+            beats: timeSignature.timeSignature[0],
+            beatType: timeSignature.timeSignature[1],
+          }))
+          .sort((a, b) => a.position - b.position);
+
+        score.timeSignatures = score.timeSignatures
+          .concat(timeSignatures)
+          .filter((value, index, array) => {
+            if (index === array.length - 1) return true;
+            return value.position !== array[index + 1].position;
+          });
+
+        await dispatch("SET_SCORE", { score });
+      }
+    ),
+  },
+
+  IMPORT_MUSICXML_FILE: {
+    action: createUILockAction(
+      async ({ dispatch }, { filePath }: { filePath?: string }) => {
+        if (!filePath) {
+          filePath = await window.electron.showImportFileDialog({
+            title: "MusicXML読み込み",
+            name: "MusicXML",
+            extensions: ["musicxml", "xml"],
+          });
+          if (!filePath) return;
+        }
+
+        let xmlStr = new TextDecoder("utf-8").decode(
+          await window.electron.readFile({ filePath })
+        );
+        if (xmlStr.indexOf("\ufffd") > -1) {
+          xmlStr = new TextDecoder("shift-jis").decode(
+            await window.electron.readFile({ filePath })
+          );
+        }
+
+        const score = await dispatch("GET_EMPTY_SCORE");
+
+        const getMeasureDuration = (beats: number, beatType: number) => {
+          const referenceMeasureDuration = score.resolution * 4;
+          return Math.round((referenceMeasureDuration * beats) / beatType);
+        };
+
+        let divisions = 1;
+        let position = 0;
+        let measurePosition = 0;
+        let measureDuration = getMeasureDuration(
+          score.timeSignatures[0].beats,
+          score.timeSignatures[0].beatType
+        );
+        let tieStartNote: Note | null = null;
+
+        const getChild = (element: Element | null, tagName: string) => {
+          if (element === null) return null;
+          for (const childElement of element.children) {
+            if (childElement.tagName === tagName) {
+              return childElement;
+            }
+          }
+          return null;
+        };
+
+        const getValueAsNumber = (element: Element) => {
+          const value = Number(element.textContent);
+          if (Number.isNaN(value)) {
+            throw new Error("The value is invalid.");
+          }
+          return value;
+        };
+
+        const getAttributeAsNumber = (
+          element: Element,
+          qualifiedName: string
+        ) => {
+          const value = Number(element.getAttribute(qualifiedName));
+          if (Number.isNaN(value)) {
+            throw new Error("The value is invalid.");
+          }
+          return value;
+        };
+
+        const round = (value: number, digits: number) => {
+          const powerOf10 = 10 ** digits;
+          return Math.round(value * powerOf10) / powerOf10;
+        };
+
+        const getStepNumber = (stepElement: Element) => {
+          const stepNumberDict: { [key: string]: number } = {
+            C: 0,
+            D: 2,
+            E: 4,
+            F: 5,
+            G: 7,
+            A: 9,
+            B: 11,
+          };
+          const stepChar = stepElement.textContent;
+          if (stepChar === null) {
+            throw new Error("The value is invalid.");
+          }
+          return stepNumberDict[stepChar];
+        };
+
+        const getDuration = (durationElement: Element) => {
+          const duration = getValueAsNumber(durationElement);
+          return Math.round((score.resolution * duration) / divisions);
+        };
+
+        const getTie = (elementThatMayBeTied: Element) => {
+          let tie = false;
+          for (const childElement of elementThatMayBeTied.children) {
+            if (
+              childElement.tagName === "tie" ||
+              childElement.tagName === "tied"
+            ) {
+              const tieType = childElement.getAttribute("type");
+              if (tieType === "start") {
+                tie = true;
+              } else if (tieType === "stop") {
+                tie = false;
+              } else {
+                throw new Error("The value is invalid.");
+              }
+            }
+          }
+          return tie;
+        };
+
+        const parseSound = (soundElement: Element) => {
+          if (!soundElement.hasAttribute("tempo")) return;
+          if (score.tempos.length !== 0) {
+            const lastTempo = score.tempos[score.tempos.length - 1];
+            if (lastTempo.position === position) {
+              score.tempos.pop();
+            }
+          }
+          const tempo = getAttributeAsNumber(soundElement, "tempo");
+          score.tempos.push({
+            position: position,
+            tempo: round(tempo, 2),
+          });
+        };
+
+        const parseDirection = (directionElement: Element) => {
+          for (const childElement of directionElement.children) {
+            if (childElement.tagName === "sound") {
+              parseSound(childElement);
+            }
+          }
+        };
+
+        const parseDivisions = (divisionsElement: Element) => {
+          divisions = getValueAsNumber(divisionsElement);
+        };
+
+        const parseTime = (timeElement: Element) => {
+          const beatsElement = getChild(timeElement, "beats");
+          if (beatsElement === null) {
+            throw new Error("beats element does not exist.");
+          }
+          const beatTypeElement = getChild(timeElement, "beat-type");
+          if (beatTypeElement === null) {
+            throw new Error("beat-type element does not exist.");
+          }
+          const beats = getValueAsNumber(beatsElement);
+          const beatType = getValueAsNumber(beatTypeElement);
+          measureDuration = getMeasureDuration(beats, beatType);
+          if (score.timeSignatures.length !== 0) {
+            const lastTimeSignature =
+              score.timeSignatures[score.timeSignatures.length - 1];
+            if (lastTimeSignature.position === position) {
+              score.timeSignatures.pop();
+            }
+          }
+          score.timeSignatures.push({
+            position: position,
+            beats: beats,
+            beatType: beatType,
+          });
+        };
+
+        const parseAttributes = (attributesElement: Element) => {
+          for (const childElement of attributesElement.children) {
+            if (childElement.tagName === "divisions") {
+              parseDivisions(childElement);
+            } else if (childElement.tagName === "time") {
+              parseTime(childElement);
+            } else if (childElement.tagName === "sound") {
+              parseSound(childElement);
+            }
+          }
+        };
+
+        const parseNote = (noteElement: Element) => {
+          // TODO: ノートの重なり・和音を考慮していないので、
+          //       それらが存在する場合でも読み込めるようにする
+
+          const durationElement = getChild(noteElement, "duration");
+          if (durationElement === null) {
+            throw new Error("duration element does not exist.");
+          }
+          let duration = getDuration(durationElement);
+          let noteEnd = position + duration;
+          const measureEnd = measurePosition + measureDuration;
+          if (noteEnd > measureEnd) {
+            // 小節に収まらない場合、ノートの長さを変えて小節に収まるようにする
+            duration = measureEnd - position;
+            noteEnd = position + duration;
+          }
+
+          if (getChild(noteElement, "rest") !== null) {
+            position += duration;
+            return;
+          }
+
+          const pitchElement = getChild(noteElement, "pitch");
+          if (pitchElement === null) {
+            throw new Error("pitch element does not exist.");
+          }
+          const octaveElement = getChild(pitchElement, "octave");
+          if (octaveElement === null) {
+            throw new Error("octave element does not exist.");
+          }
+          const stepElement = getChild(pitchElement, "step");
+          if (stepElement === null) {
+            throw new Error("step element does not exist.");
+          }
+          const alterElement = getChild(pitchElement, "alter");
+
+          const octave = getValueAsNumber(octaveElement);
+          const stepNumber = getStepNumber(stepElement);
+          let noteNumber = 12 * (octave + 1) + stepNumber;
+          if (alterElement !== null) {
+            noteNumber += getValueAsNumber(alterElement);
+          }
+
+          const lyricElement = getChild(noteElement, "lyric");
+          const lyric = getChild(lyricElement, "text")?.textContent ?? "";
+
+          let tie = getTie(noteElement);
+          for (const childElement of noteElement.children) {
+            if (childElement.tagName === "notations") {
+              tie = getTie(childElement);
+            }
+          }
+
+          const note = {
+            position: position,
+            duration: duration,
+            midi: noteNumber,
+            lyric: lyric,
+          };
+
+          if (tie) {
+            if (tieStartNote === null) {
+              tieStartNote = note;
+            }
+          } else {
+            if (tieStartNote === null) {
+              score.notes.push(note);
+            } else {
+              tieStartNote.duration = noteEnd - tieStartNote.position;
+              score.notes.push(tieStartNote);
+              tieStartNote = null;
+            }
+          }
+          position += duration;
+        };
+
+        const parseMeasure = (measureElement: Element) => {
+          measurePosition = position;
+          for (const childElement of measureElement.children) {
+            if (childElement.tagName === "direction") {
+              parseDirection(childElement);
+            } else if (childElement.tagName === "sound") {
+              parseSound(childElement);
+            } else if (childElement.tagName === "attributes") {
+              parseAttributes(childElement);
+            } else if (childElement.tagName === "note") {
+              if (position < measurePosition + measureDuration) {
+                parseNote(childElement);
+              }
+            }
+          }
+          const measureEnd = measurePosition + measureDuration;
+          if (position !== measureEnd) {
+            tieStartNote = null;
+            position = measureEnd;
+          }
+        };
+
+        const parsePart = (partElement: Element) => {
+          for (const childElement of partElement.children) {
+            if (childElement.tagName === "measure") {
+              parseMeasure(childElement);
+            }
+          }
+        };
+
+        const parseMusicXml = (xmlStr: string) => {
+          const parser = new DOMParser();
+          const dom = parser.parseFromString(xmlStr, "application/xml");
+          const partElements = dom.getElementsByTagName("part");
+          if (partElements.length === 0) {
+            throw new Error("part element does not exist.");
+          }
+          // TODO: UIで読み込むパートを選択できるようにする
+          parsePart(partElements[0]);
+        };
+
+        parseMusicXml(xmlStr);
+
+        await dispatch("SET_SCORE", { score });
+      }
+    ),
+  },
 });
diff --git a/src/store/type.ts b/src/store/type.ts
index 53d2fa1b48..19150f4230 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -714,7 +714,7 @@ export type SingingStoreTypes = {
     action(payload: { engineId?: string; styleId?: number }): void;
   };
 
-  GET_DEFAULT_SCORE: {
+  GET_EMPTY_SCORE: {
     action(): Promise<Score>;
   };
 
@@ -722,6 +722,14 @@ export type SingingStoreTypes = {
     mutation: { score: Score };
     action(payload: { score: Score }): void;
   };
+
+  IMPORT_MIDI_FILE: {
+    action(payload: { filePath?: string }): void;
+  };
+
+  IMPORT_MUSICXML_FILE: {
+    action(payload: { filePath?: string }): void;
+  };
 };
 
 /*
diff --git a/src/type/ipc.ts b/src/type/ipc.ts
index 7fbca9ebf8..b4500cbd42 100644
--- a/src/type/ipc.ts
+++ b/src/type/ipc.ts
@@ -78,7 +78,7 @@ export type IpcIHData = {
   };
 
   SHOW_IMPORT_FILE_DIALOG: {
-    args: [obj: { title: string }];
+    args: [obj: { title: string; name?: string; extensions?: string[] }];
     return?: string;
   };
 
diff --git a/src/type/preload.ts b/src/type/preload.ts
index 06970d10e4..c9fb2180d7 100644
--- a/src/type/preload.ts
+++ b/src/type/preload.ts
@@ -59,7 +59,11 @@ export interface Sandbox {
     buttons: string[];
     cancelId?: number;
   }): Promise<number>;
-  showImportFileDialog(obj: { title: string }): Promise<string | undefined>;
+  showImportFileDialog(obj: {
+    title: string;
+    name?: string;
+    extensions?: string[];
+  }): Promise<string | undefined>;
   writeFile(obj: {
     filePath: string;
     buffer: ArrayBuffer;
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index e199e7dd8f..c92b09a91e 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -50,7 +50,7 @@ export default defineComponent({
     onMounted(async () => {
       await store.dispatch("SET_SINGER", {});
 
-      const score = await store.dispatch("GET_DEFAULT_SCORE");
+      const score = await store.dispatch("GET_EMPTY_SCORE");
 
       // 実装時の確認用です TODO: 必要なくなったら削除
       score.notes = [

From 99a02ed39f99f3a77e53ce78fd6cd9f8e1c2e2e0 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Fri, 25 Nov 2022 21:38:51 +0900
Subject: [PATCH 07/59] =?UTF-8?q?project-s:=20=E3=83=86=E3=83=B3=E3=83=9D?=
 =?UTF-8?q?=E3=83=BB=E6=8B=8D=E5=AD=90=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=A8?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E8=A1=8C=E3=81=86=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1025)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* テンポ・拍子の表示と設定を行う機能を追加

* 不要な引数チェックを削除、テンポを四捨五入するように変更

* positionの値のチェックを追加

* 値が0の場合リターンするように修正

* ADDからSETに名前を変更
---
 src/components/Sing/ToolBar.vue | 132 ++++++++++++++++++++++++--
 src/store/singing.ts            | 160 +++++++++++++++++++++++++++++++-
 src/store/type.ts               |  20 ++++
 3 files changed, 301 insertions(+), 11 deletions(-)

diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 396987dc35..edadfece9b 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -11,9 +11,46 @@
       <button type="button" class="sing-button-temp">戻る</button>
       <button type="button" class="sing-button-temp">再生</button>
       <div class="sing-player-position">00:00</div>
-      <input type="number" value="120" class="sing-bpm" />
-      <input type="number" value="4" class="sing-tempo" />/
-      <input type="number" value="4" class="sing-tempo" />
+      <q-input
+        type="number"
+        :model-value="tempoInputBuffer"
+        dense
+        hide-bottom-space
+        class="sing-tempo"
+        @update:model-value="setTempoInputBuffer"
+        @change="setTempo()"
+      >
+        <template v-slot:prepend>
+          <div />
+        </template>
+      </q-input>
+      <q-input
+        type="number"
+        :model-value="beatsInputBuffer"
+        dense
+        hide-bottom-space
+        class="sing-time-signature"
+        @update:model-value="setBeatsInputBuffer"
+        @change="setTimeSignature()"
+      >
+        <template v-slot:prepend>
+          <div />
+        </template>
+      </q-input>
+      /
+      <q-input
+        type="number"
+        :model-value="beatTypeInputBuffer"
+        dense
+        hide-bottom-space
+        class="sing-time-signature"
+        @update:model-value="setBeatTypeInputBuffer"
+        @change="setTimeSignature()"
+      >
+        <template v-slot:prepend>
+          <div />
+        </template>
+      </q-input>
     </div>
     <div class="sing-setting">
       <input type="range" min="0" max="100" class="sing-volume" />
@@ -25,7 +62,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed } from "vue";
+import { defineComponent, computed, watch, ref } from "vue";
 import { useStore } from "@/store";
 
 export default defineComponent({
@@ -62,12 +99,87 @@ export default defineComponent({
         )?.iconPath
     );
 
+    const tempoInputBuffer = ref(0);
+    const beatsInputBuffer = ref(0);
+    const beatTypeInputBuffer = ref(0);
+
+    const setTempoInputBuffer = (tempoStr: string) => {
+      const tempo = Number(tempoStr);
+      if (Number.isNaN(tempo) || tempo <= 0) return;
+      tempoInputBuffer.value = tempo;
+    };
+    const setBeatsInputBuffer = (beatsStr: string) => {
+      const beats = Number(beatsStr);
+      if (!Number.isInteger(beats) || beats <= 0) return;
+      beatsInputBuffer.value = beats;
+    };
+    const setBeatTypeInputBuffer = (beatTypeStr: string) => {
+      const beatType = Number(beatTypeStr);
+      if (!Number.isInteger(beatType) || beatType <= 0) return;
+      beatTypeInputBuffer.value = beatType;
+    };
+
+    const tempos = computed(() => store.state.score?.tempos);
+    const timeSignatures = computed(() => store.state.score?.timeSignatures);
+
+    watch(
+      tempos,
+      () => {
+        tempoInputBuffer.value = tempos.value?.[0].tempo ?? 0;
+      },
+      { deep: true }
+    );
+    watch(
+      timeSignatures,
+      () => {
+        beatsInputBuffer.value = timeSignatures.value?.[0].beats ?? 0;
+      },
+      { deep: true }
+    );
+    watch(
+      timeSignatures,
+      () => {
+        beatTypeInputBuffer.value = timeSignatures.value?.[0].beatType ?? 0;
+      },
+      { deep: true }
+    );
+
+    const setTempo = async () => {
+      const tempo = tempoInputBuffer.value;
+      if (tempo === 0) return;
+      await store.dispatch("SET_TEMPO", {
+        tempo: {
+          position: 0,
+          tempo: tempo,
+        },
+      });
+    };
+
+    const setTimeSignature = async () => {
+      const beats = beatsInputBuffer.value;
+      const beatType = beatTypeInputBuffer.value;
+      if (beats === 0 || beatType === 0) return;
+      await store.dispatch("SET_TIME_SIGNATURE", {
+        timeSignature: {
+          position: 0,
+          beats: beats,
+          beatType: beatType,
+        },
+      });
+    };
+
     return {
       isShowSinger,
       toggleShowSinger,
-      userOrderedCharacterInfos,
-      selectedCharacterInfo,
       selectedStyleIconPath,
+      tempoInputBuffer,
+      beatsInputBuffer,
+      beatTypeInputBuffer,
+      setTempoInputBuffer,
+      setBeatsInputBuffer,
+      setBeatTypeInputBuffer,
+      setTempo,
+      setTimeSignature,
     };
   },
 });
@@ -120,14 +232,14 @@ export default defineComponent({
   margin: 0 4px;
 }
 
-.sing-bpm {
+.sing-tempo {
   margin: 0 4px;
-  width: 56px;
+  width: 64px;
 }
 
-.sing-tempo {
+.sing-time-signature {
   margin: 0 4px;
-  width: 32px;
+  width: 36px;
 }
 
 .sing-player-position {
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 4932143b5a..dc9365e6e8 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,4 +1,11 @@
-import { Note, Score, SingingStoreState, SingingStoreTypes } from "./type";
+import {
+  Score,
+  Tempo,
+  TimeSignature,
+  Note,
+  SingingStoreState,
+  SingingStoreTypes,
+} from "./type";
 import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
 import { Midi } from "@tonejs/midi";
@@ -80,6 +87,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         timeSignatures: [{ position: 0, beats: 4, beatType: 4 }],
         notes: [],
       };
+      if (score.tempos.length !== 1 || score.tempos[0].position !== 0) {
+        throw new Error("Tempo does not exist at the beginning of the score.");
+      }
+      if (
+        score.timeSignatures.length !== 1 ||
+        score.timeSignatures[0].position !== 0
+      ) {
+        throw new Error(
+          "Time signature does not exist at the beginning of the score."
+        );
+      }
       return score;
     },
   },
@@ -93,6 +111,146 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_TEMPO: {
+    mutation(state, { index, tempo }: { index: number; tempo: Tempo }) {
+      state.score?.tempos.splice(index, 0, tempo);
+    },
+    // テンポを設定する。既に同じ位置にテンポが存在する場合は置き換える。
+    async action({ state, commit }, { tempo }: { tempo: Tempo }) {
+      const score = state.score;
+      if (score === undefined || score.tempos.length === 0) {
+        throw new Error("Score is not initialized.");
+      }
+      if (
+        Number.isNaN(tempo.position) ||
+        tempo.position < 0 ||
+        Number.isNaN(tempo.tempo) ||
+        tempo.tempo <= 0
+      ) {
+        throw new Error("The value is invalid.");
+      }
+      const duplicate = score.tempos.some((value) => {
+        return value.position === tempo.position;
+      });
+      const index = score.tempos.findIndex((value) => {
+        return value.position >= tempo.position;
+      });
+      if (index === -1) return;
+
+      const round = (value: number, digits: number) => {
+        const powerOf10 = 10 ** digits;
+        return Math.round(value * powerOf10) / powerOf10;
+      };
+
+      tempo.tempo = round(tempo.tempo, 2);
+
+      if (duplicate) {
+        commit("REMOVE_TEMPO", { index });
+      }
+      commit("SET_TEMPO", { index, tempo });
+    },
+  },
+
+  REMOVE_TEMPO: {
+    mutation(state, { index }: { index: number }) {
+      state.score?.tempos.splice(index, 1);
+    },
+    // テンポを削除する。先頭のテンポの場合はデフォルトのテンポに置き換える。
+    async action(
+      { state, commit, dispatch },
+      { position }: { position: number }
+    ) {
+      const emptyScore = await dispatch("GET_EMPTY_SCORE");
+      const defaultTempo = emptyScore.tempos[0];
+
+      const score = state.score;
+      if (score === undefined || score.tempos.length === 0) {
+        throw new Error("Score is not initialized.");
+      }
+      const index = score.tempos.findIndex((value) => {
+        return value.position === position;
+      });
+      if (index === -1) return;
+
+      commit("REMOVE_TEMPO", { index });
+      if (score.tempos.length === 0) {
+        commit("SET_TEMPO", { index, tempo: defaultTempo });
+      }
+    },
+  },
+
+  SET_TIME_SIGNATURE: {
+    mutation(
+      state,
+      { index, timeSignature }: { index: number; timeSignature: TimeSignature }
+    ) {
+      state.score?.timeSignatures.splice(index, 0, timeSignature);
+    },
+    // 拍子を設定する。既に同じ位置に拍子が存在する場合は置き換える。
+    async action(
+      { state, commit },
+      { timeSignature }: { timeSignature: TimeSignature }
+    ) {
+      const score = state.score;
+      if (score === undefined || score.timeSignatures.length === 0) {
+        throw new Error("Score is not initialized.");
+      }
+      if (
+        Number.isNaN(timeSignature.position) ||
+        timeSignature.position < 0 ||
+        !Number.isInteger(timeSignature.beats) ||
+        !Number.isInteger(timeSignature.beatType) ||
+        timeSignature.beats <= 0 ||
+        timeSignature.beatType <= 0
+      ) {
+        throw new Error("The value is invalid.");
+      }
+      const duplicate = score.timeSignatures.some((value) => {
+        return value.position === timeSignature.position;
+      });
+      const index = score.timeSignatures.findIndex((value) => {
+        return value.position >= timeSignature.position;
+      });
+      if (index === -1) return;
+
+      if (duplicate) {
+        commit("REMOVE_TIME_SIGNATURE", { index });
+      }
+      commit("SET_TIME_SIGNATURE", { index, timeSignature });
+    },
+  },
+
+  REMOVE_TIME_SIGNATURE: {
+    mutation(state, { index }: { index: number }) {
+      state.score?.timeSignatures.splice(index, 1);
+    },
+    // 拍子を削除する。先頭の拍子の場合はデフォルトの拍子に置き換える。
+    async action(
+      { state, commit, dispatch },
+      { position }: { position: number }
+    ) {
+      const emptyScore = await dispatch("GET_EMPTY_SCORE");
+      const defaultTimeSignature = emptyScore.timeSignatures[0];
+
+      const score = state.score;
+      if (score === undefined || score.timeSignatures.length === 0) {
+        throw new Error("Score is not initialized.");
+      }
+      const index = score.timeSignatures.findIndex((value) => {
+        return value.position === position;
+      });
+      if (index === -1) return;
+
+      commit("REMOVE_TIME_SIGNATURE", { index });
+      if (score.timeSignatures.length === 0) {
+        commit("SET_TIME_SIGNATURE", {
+          index,
+          timeSignature: defaultTimeSignature,
+        });
+      }
+    },
+  },
+
   IMPORT_MIDI_FILE: {
     action: createUILockAction(
       async ({ dispatch }, { filePath }: { filePath?: string }) => {
diff --git a/src/store/type.ts b/src/store/type.ts
index 19150f4230..4c6ba09011 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -723,6 +723,26 @@ export type SingingStoreTypes = {
     action(payload: { score: Score }): void;
   };
 
+  SET_TEMPO: {
+    mutation: { index: number; tempo: Tempo };
+    action(payload: { tempo: Tempo }): void;
+  };
+
+  REMOVE_TEMPO: {
+    mutation: { index: number };
+    action(payload: { position: number }): void;
+  };
+
+  SET_TIME_SIGNATURE: {
+    mutation: { index: number; timeSignature: TimeSignature };
+    action(payload: { timeSignature: TimeSignature }): void;
+  };
+
+  REMOVE_TIME_SIGNATURE: {
+    mutation: { index: number };
+    action(payload: { position: number }): void;
+  };
+
   IMPORT_MIDI_FILE: {
     action(payload: { filePath?: string }): void;
   };

From 495b9d4a02a980d2400aaed16388a9ebf016866c Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Sun, 5 Feb 2023 21:07:20 +0900
Subject: [PATCH 08/59] =?UTF-8?q?[project-s]=20=E3=83=94=E3=82=A2=E3=83=8E?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=AB=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA/=E8=BF=BD=E5=8A=A0/=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20(#1102)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* #986 鍵盤およびY軸表示

* 11月仕掛かり分

* #986 MIDIからの表示

* #986 一応ながら追加/削除/歌詞入力が行えるようにする

* #936 ズーム動作(試行)

* #986 表示時にスク ロール位置をC4周辺に+スクロール速度確認

* #986 表示調整

* #986 調整

* #986 指摘点修正他

* #986 遅いためSVG化(仕掛かり)

* #986 ノートのSVGグリッド にあわせた処理

* #986 スタイル指定をCSSクラスに修正

* #986 表示最適化+ズームをoninputで即時

* #986 ノートコンポーネント(予約空ファイル)

* #986 小節ライン

* #986 バー追加時は1/4

* Update src/store/singing.ts

Co-authored-by: Sig <sigprogrammer@gmail.com>

* Update src/store/singing.ts

Co-authored-by: Sig <sigprogrammer@gmail.com>

* #986 ノート追加後そのままドラッグを考慮しmousedownに変更

* #986 見た目調整

* #986 translateで位置指定

---------

Co-authored-by: Romot <romot@romotmbp16.local>
Co-authored-by: Sig <sigprogrammer@gmail.com>
---
 src/components/Sing/ScoreNote.vue             |   0
 src/components/Sing/ScoreSequencer.vue        | 417 +++++++++++++++++-
 .../{LyricInput.vue => SequencerNote.vue}     |   0
 src/helpers/singHelper.ts                     |  63 +++
 src/store/singing.ts                          | 107 ++++-
 src/store/type.ts                             |  40 ++
 src/views/SingerHome.vue                      |  19 +-
 tests/unit/store/Vuex.spec.ts                 |   5 +
 8 files changed, 630 insertions(+), 21 deletions(-)
 delete mode 100644 src/components/Sing/ScoreNote.vue
 rename src/components/Sing/{LyricInput.vue => SequencerNote.vue} (100%)
 create mode 100644 src/helpers/singHelper.ts

diff --git a/src/components/Sing/ScoreNote.vue b/src/components/Sing/ScoreNote.vue
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 93f6c3f328..f8d06d83eb 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -1,18 +1,308 @@
 <template>
-  <div class="score-sequencer">
-    <div class="score-sequencer-keys" />
-    シーケンサ
+  <div class="score-sequencer" id="score-sequencer">
+    <!-- 鍵盤表示 -->
+    <svg
+      width="48"
+      v-bind:height="`${BASE_Y_SIZE * zoomY * 128}`"
+      xmlns="http://www.w3.org/2000/svg"
+      class="sequencer-keys"
+    >
+      <g v-for="(y, index) in gridY" :key="index">
+        <rect
+          x="0"
+          v-bind:y="`${BASE_Y_SIZE * zoomY * index}`"
+          v-bind:width="`${y.color === 'black' ? 30 : 48}`"
+          v-bind:height="`${BASE_Y_SIZE * zoomY}`"
+          v-bind:class="`sequencer-keys-item-${y.color}`"
+          v-bind:title="y.name"
+        />
+        <line
+          x1="0"
+          v-bind:y1="`${(index + 1) * BASE_Y_SIZE * zoomY}`"
+          x2="48"
+          v-bind:y2="`${(index + 1) * BASE_Y_SIZE * zoomY}`"
+          stroke-width="1"
+          v-bind:class="`sequencer-keys-item-separator ${
+            y.pitch === 'C' && 'sequencer-keys-item-separator-octave'
+          } ${y.pitch === 'F' && 'sequencer-keys-item-separator-f'}`"
+          v-if="y.pitch === 'C' || y.pitch === 'F'"
+        />
+        <text
+          font-size="10"
+          x="32"
+          v-bind:y="`${BASE_Y_SIZE * zoomY * (index + 1) - 4}`"
+          v-if="y.pitch === 'C'"
+          class="sequencer-keys-item-pitchname"
+        >
+          {{ y.name }}
+        </text>
+      </g>
+    </svg>
+    <div class="sequencer-body">
+      <!-- グリッド -->
+      <!-- NOTE: 現状小節+オクターブごとの罫線なし -->
+      <svg
+        v-bind:height="`${BASE_Y_SIZE * zoomY * 128}`"
+        v-bind:width="`${gridX.length * BASE_X_SIZE * zoomX}`"
+        xmlns="http://www.w3.org/2000/svg"
+        class="sequencer-grids"
+      >
+        <defs>
+          <pattern
+            id="sequencer-grid-16"
+            v-bind:width="`${BASE_X_SIZE * zoomX}px`"
+            v-bind:height="`${12 * BASE_Y_SIZE * zoomY}px`"
+            patternUnits="userSpaceOnUse"
+          >
+            <rect
+              v-for="(y, index) in gridY"
+              :key="index"
+              x="0"
+              v-bind:y="`${BASE_Y_SIZE * zoomY * index}`"
+              v-bind:width="`${BASE_X_SIZE * zoomX}`"
+              v-bind:height="`${BASE_Y_SIZE * zoomY}`"
+              v-bind:class="`sequencer-grids-col sequencer-grids-col-${y.color}`"
+            />
+          </pattern>
+          <!-- NOTE: 4/4 1小節でグリッド見た目確認目的 -->
+          <pattern
+            id="sequencer-grid-measure"
+            v-bind:width="`${BASE_X_SIZE * 16 * zoomX}`"
+            v-bind:height="`${12 * BASE_Y_SIZE * zoomY}`"
+            patternUnits="userSpaceOnUse"
+          >
+            <rect width="100%" height="100%" fill="url(#sequencer-grid-16)" />
+            <line
+              x="100%"
+              x2="0"
+              y1="0"
+              y2="100%"
+              stroke-width="1"
+              fill="none"
+              class="sequencer-grid-separator-line"
+            />
+          </pattern>
+        </defs>
+        <rect
+          x="0"
+          y="0"
+          width="100%"
+          height="100%"
+          id="sequencer-grid"
+          fill="url(#sequencer-grid-measure)"
+          @mousedown="(e) => addNote(e)"
+        />
+      </svg>
+      <!-- NOTE: ノートと歌詞入力あわせコンポーネント分割予定 -->
+      <div
+        v-for="(note, index) in notes"
+        :key="index"
+        class="sequencer-note"
+        v-bind:style="{
+          transform: `translate3d(${(note.position / 4) * zoomX}px,${
+            (127 - note.midi) * BASE_Y_SIZE * zoomY
+          }px,0)`,
+        }"
+      >
+        <!-- NOTE: q-inputへの変更 / 表示面+速度面から、クリック時のみinputを表示に変更予定 -->
+        <input
+          type="text"
+          :value="note.lyric"
+          @input="(e) => setLyric(index, e)"
+          class="sequencer-note-lyric"
+        />
+        <svg
+          v-bind:height="`${BASE_Y_SIZE * zoomY}`"
+          v-bind:width="`${(note.duration / 4) * zoomX}`"
+          xmlns="http://www.w3.org/2000/svg"
+          class="sequencer-note-bar"
+        >
+          <g @dblclick="removeNote(index)">
+            <rect
+              y="0"
+              x="0"
+              height="100%"
+              width="100%"
+              stroke-width="1"
+              class="sequencer-note-bar-body"
+            />
+            <rect
+              y="0"
+              x="-4"
+              height="100%"
+              width="8"
+              fill-opacity="0"
+              draggable
+              class="sequencer-note-bar-draghandle"
+            />
+            <rect
+              y="0"
+              v-bind:x="`${(note.duration / 4) * zoomX - 4}`"
+              height="100%"
+              width="8"
+              fill-opacity="0"
+              class="sequencer-note-bar-draghandle"
+              draggable
+            />
+          </g>
+        </svg>
+      </div>
+    </div>
+    <!-- NOTE: スクロールバー+ズームレンジ仮 -->
+    <input
+      type="range"
+      min="0.2"
+      max="1"
+      step="0.05"
+      :value="zoomX"
+      @input="(e) => setZoomX(e)"
+      v-bind:style="{
+        position: 'fixed',
+        zIndex: 10000,
+        bottom: '8px',
+        right: '16px',
+        width: '80px',
+      }"
+    />
+    <input
+      type="range"
+      min="0.25"
+      max="1"
+      step="0.05"
+      :value="zoomY"
+      @input="(e) => setZoomY(e)"
+      v-bind:style="{
+        position: 'fixed',
+        zIndex: 10000,
+        bottom: '64px',
+        right: '-8px',
+        transform: 'rotate(-90deg)',
+        width: '80px',
+      }"
+    />
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+import { defineComponent, computed, onMounted } from "vue";
+import { useStore } from "@/store";
+import {
+  midiKeys,
+  getPitchFromMidi,
+  getDoremiFromMidi,
+} from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingScoreSequencer",
-
   setup() {
-    return null;
+    const store = useStore();
+    const gridY = midiKeys;
+    const gridX = computed(() => {
+      const resolution = store.state.score?.resolution || 480;
+      // NOTE: 最低長: 仮32小節...MIDI長さ(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
+      const minDuration = resolution * 4 * 32;
+      const lastNote = store.state.score?.notes.slice(-1)[0];
+      // Score長さ: スコア長もしくは最低長のうち長い方
+      const totalDuration = lastNote
+        ? Math.max(lastNote.position + lastNote.duration, minDuration)
+        : minDuration;
+      // グリッド幅1/16
+      const gridDuration = resolution / 4;
+      // NOTE: いったん最後尾に足した場合は伸びるようにする
+      const gridsMax = Math.ceil(totalDuration / gridDuration) + 16;
+      return [...Array(gridsMax).keys()].map(
+        (gridNum) => gridNum * gridDuration
+      );
+    });
+    const notes = computed(() => store.state.score?.notes);
+    const timeSignatures = computed(() => store.state.score?.timeSignatures);
+    const zoomX = computed(() => store.state.sequencerZoomX);
+    const zoomY = computed(() => store.state.sequencerZoomY);
+    const scrollX = computed(() => store.state.sequencerScrollX);
+    const scrollY = computed(() => store.state.sequencerScrollY);
+    const BASE_Y_SIZE = 30;
+    const BASE_X_SIZE = 30;
+    onMounted(() => {
+      const el = document.querySelector("#score-sequencer");
+      // C4あたりにスクロールする
+      if (el) {
+        el.scrollTop = scrollY.value * (BASE_Y_SIZE * zoomY.value);
+      }
+    });
+    const addNote = (event: MouseEvent) => {
+      const resolution = store.state.score?.resolution;
+      const gridXSize = resolution ? resolution / 4 : 120;
+      const position =
+        gridXSize * Math.floor(event.offsetX / (BASE_X_SIZE * zoomX.value));
+      const midi =
+        127 - Math.floor(event.offsetY / (BASE_Y_SIZE * zoomY.value));
+      if (0 > midi) {
+        return;
+      }
+      // NOTE: ノートの追加は1/8をベース
+      const duration = gridXSize * 2;
+      const lyric = getDoremiFromMidi(midi);
+      store.dispatch("ADD_NOTE", {
+        note: {
+          position,
+          midi,
+          duration,
+          lyric,
+        },
+      });
+    };
+    const removeNote = (index: number) => {
+      store.dispatch("REMOVE_NOTE", { index });
+    };
+    // NOTE: ノートのバーと歌詞入力でコンポーネント分割予定
+    const setLyric = (index: number, event: Event) => {
+      if (!(event.target instanceof HTMLInputElement)) {
+        return;
+      }
+      if (event.target.value && store.state.score) {
+        const currentNote = store.state.score?.notes[index];
+        const lyric = event.target.value;
+        store.dispatch("CHANGE_NOTE", {
+          index,
+          note: {
+            ...currentNote,
+            lyric,
+          },
+        });
+      }
+    };
+    const setZoomX = (event: Event) => {
+      if (!(event.target instanceof HTMLInputElement)) {
+        return;
+      }
+      store.dispatch("SET_ZOOM_X", {
+        zoomX: Number(event.target.value),
+      });
+    };
+    const setZoomY = (event: Event) => {
+      if (!(event.target instanceof HTMLInputElement)) {
+        return;
+      }
+      store.dispatch("SET_ZOOM_Y", {
+        zoomY: Number(event.target.value),
+      });
+    };
+    return {
+      timeSignatures,
+      gridY,
+      gridX,
+      notes,
+      zoomX,
+      zoomY,
+      getPitchFromMidi,
+      addNote,
+      removeNote,
+      setLyric,
+      setZoomX,
+      setZoomY,
+      BASE_X_SIZE,
+      BASE_Y_SIZE,
+    };
   },
 });
 </script>
@@ -20,4 +310,119 @@ export default defineComponent({
 <style scoped lang="scss">
 @use '@/styles/variables' as vars;
 @use '@/styles/colors' as colors;
+
+.score-sequencer {
+  backface-visibility: hidden;
+  display: block;
+  height: 100%;
+  overflow: auto;
+  padding-bottom: 164px;
+  position: relative;
+  width: 100%;
+}
+
+.sequencer-keys {
+  backface-visibility: hidden;
+  background: #fff;
+  display: block;
+  position: sticky;
+  left: 0;
+  z-index: 100;
+}
+
+.sequencer-keys-item-separator-octave {
+  stroke: #bbb;
+}
+
+.sequencer-keys-item-separator-f {
+  stroke: #ddd;
+}
+
+.sequencer-keys-item-white {
+  fill: #fff;
+}
+
+.sequencer-keys-item-black {
+  fill: #555;
+}
+
+.sequencer-keys-item-pitchname {
+  fill: #555;
+}
+
+.sequencer-body {
+  backface-visibility: hidden;
+  display: block;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  top: 0;
+  left: 48px;
+  padding-bottom: 164px;
+}
+
+.sequencer-grids {
+  display: block;
+}
+
+.sequencer-grids-col {
+  display: block;
+  stroke: #e8e8e8;
+  stroke-width: 1;
+}
+
+.sequencer-grids-col-white {
+  fill: #fff;
+}
+
+.sequencer-grids-col-black {
+  fill: #f2f2f2;
+}
+
+.sequencer-grid-separator-line {
+  backface-visibility: hidden;
+  stroke: #b0b0b0;
+}
+
+.sequencer-note {
+  backface-visibility: hidden;
+  position: absolute;
+  top: 0;
+  left: 0;
+  transform-origin: 0, 0;
+}
+
+.sequencer-note-lyric {
+  background: white;
+  border: 0;
+  border-bottom: 1px solid colors.$primary-light;
+  color: colors.$display;
+  font-size: 12px;
+  font-weight: bold;
+  font-feature-settings: "palt" 1;
+  letter-spacing: 0.05em;
+  outline: none;
+  padding: 0;
+  position: absolute;
+  bottom: calc(100% - 1px);
+  left: 0;
+  width: 24px;
+}
+
+.sequencer-note-bar {
+  display: block;
+  position: relative;
+}
+.sequencer-note-bar-body {
+  fill: colors.$primary;
+  stroke: #fff;
+  stroke-opacity: 0.5;
+  position: relative;
+  top: 0;
+  left: 0;
+}
+
+.sequencer-note-bar-draghandle {
+  cursor: ew-resize;
+}
 </style>
diff --git a/src/components/Sing/LyricInput.vue b/src/components/Sing/SequencerNote.vue
similarity index 100%
rename from src/components/Sing/LyricInput.vue
rename to src/components/Sing/SequencerNote.vue
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
new file mode 100644
index 0000000000..cfe517eb64
--- /dev/null
+++ b/src/helpers/singHelper.ts
@@ -0,0 +1,63 @@
+export function getPitchFromMidi(midi: number): string {
+  const mapPitches: Array<string> = [
+    "C",
+    "C#",
+    "D",
+    "D#",
+    "E",
+    "F",
+    "F#",
+    "G",
+    "G#",
+    "A",
+    "A#",
+    "B",
+  ];
+  const pitchPos = midi % 12;
+  return mapPitches[pitchPos];
+}
+
+export function getDoremiFromMidi(midi: number): string {
+  const mapPitches: Array<string> = [
+    "ド",
+    "ド",
+    "レ",
+    "レ",
+    "ミ",
+    "ファ",
+    "ファ",
+    "ソ",
+    "ソ",
+    "ラ",
+    "ラ",
+    "シ",
+  ];
+  const pitchPos = midi % 12;
+  return mapPitches[pitchPos];
+}
+
+export function getOctaveFromMidi(midi: number): number {
+  return Math.floor(midi / 12) - 1;
+}
+
+export function getKeyColorFromMidi(midi: number): string {
+  const mapWhiteKeys: Array<string> = ["C", "D", "E", "F", "G", "A", "B"];
+  const pitch = getPitchFromMidi(midi);
+  return mapWhiteKeys.includes(pitch) ? "white" : "black";
+}
+
+export const midiKeys = [...Array(128)]
+  .map((_, midi) => {
+    const pitch = getPitchFromMidi(midi);
+    const octave = getOctaveFromMidi(midi);
+    const name = `${pitch}${octave}`;
+    const color = getKeyColorFromMidi(midi);
+    return {
+      midi,
+      pitch,
+      octave,
+      name,
+      color,
+    };
+  })
+  .reverse();
diff --git a/src/store/singing.ts b/src/store/singing.ts
index dc9365e6e8..497722b22c 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -9,6 +9,7 @@ import {
 import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
 import { Midi } from "@tonejs/midi";
+import { getDoremiFromMidi } from "@/helpers/singHelper";
 
 export const singingStoreState: SingingStoreState = {
   engineId: undefined,
@@ -17,6 +18,11 @@ export const singingStoreState: SingingStoreState = {
   renderPhrases: [],
   // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
   isShowSinger: true,
+  sequencerZoomX: 0.5,
+  sequencerZoomY: 0.5,
+  sequencerScrollY: 60, // Y軸 midi number
+  sequencerScrollX: 0, // X軸 midi duration(仮)
+  sequencerSnapSize: 120, // スナップサイズ 試行用で1/16(ppq=480)のmidi durationで固定
 };
 
 export const singingStore = createPartialStore<SingingStoreTypes>({
@@ -107,6 +113,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.score = score;
     },
     async action({ commit }, { score }: { score: Score }) {
+      console.log(score);
       commit("SET_SCORE", { score });
     },
   },
@@ -251,6 +258,104 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  ADD_NOTE: {
+    mutation(state, { note }: { note: Note }) {
+      if (state.score) {
+        const notes = state.score.notes.concat(note).sort((a, b) => {
+          return a.position - b.position;
+        });
+        state.score.notes = notes;
+      }
+    },
+    // ノートを追加する
+    // NOTE: 重複削除など別途追加
+    async action({ state, commit }, { note }: { note: Note }) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+      commit("ADD_NOTE", { note });
+    },
+  },
+
+  CHANGE_NOTE: {
+    mutation(state, { index, note }: { index: number; note: Note }) {
+      if (state.score) {
+        const notes = [...state.score.notes];
+        notes.splice(index, 1, note);
+        state.score.notes = notes;
+      }
+    },
+    async action(
+      { state, commit },
+      { index, note }: { index: number; note: Note }
+    ) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+      commit("CHANGE_NOTE", { index, note });
+    },
+  },
+
+  REMOVE_NOTE: {
+    mutation(state, { index }: { index: number }) {
+      if (state.score) {
+        const notes = [...state.score.notes];
+        notes.splice(index, 1);
+        state.score.notes = notes;
+      }
+    },
+    async action({ state, commit }, { index }: { index: number }) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+      commit("REMOVE_NOTE", { index });
+    },
+  },
+
+  SET_ZOOM_X: {
+    mutation(state, { zoomX }: { zoomX: number }) {
+      state.sequencerZoomX = zoomX;
+    },
+    async action({ commit }, { zoomX }) {
+      commit("SET_ZOOM_X", {
+        zoomX,
+      });
+    },
+  },
+
+  SET_ZOOM_Y: {
+    mutation(state, { zoomY }: { zoomY: number }) {
+      state.sequencerZoomY = zoomY;
+    },
+    async action({ commit }, { zoomY }) {
+      commit("SET_ZOOM_Y", {
+        zoomY,
+      });
+    },
+  },
+
+  SET_SCROLL_X: {
+    mutation(state, { scrollX }: { scrollX: number }) {
+      state.sequencerScrollX = scrollX;
+    },
+    async action({ commit }, { scrollX }) {
+      commit("SET_SCROLL_X", {
+        scrollX,
+      });
+    },
+  },
+
+  SET_SCROLL_Y: {
+    mutation(state, { scrollY }: { scrollY: number }) {
+      state.sequencerScrollY = scrollY;
+    },
+    async action({ commit }, { scrollY }) {
+      commit("SET_SCROLL_Y", {
+        scrollY,
+      });
+    },
+  },
+
   IMPORT_MIDI_FILE: {
     action: createUILockAction(
       async ({ dispatch }, { filePath }: { filePath?: string }) => {
@@ -297,7 +402,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               note.durationTicks
             ),
             midi: note.midi,
-            lyric: "",
+            lyric: getDoremiFromMidi(note.midi),
           }))
           .sort((a, b) => a.position - b.position)
           .forEach((note) => {
diff --git a/src/store/type.ts b/src/store/type.ts
index 4c6ba09011..aa1a7484a8 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -701,6 +701,11 @@ export type SingingStoreState = {
   // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
   isShowSinger: boolean;
   // NOTE: オーディオ再生はボイスと同様もしくは拡張して使う？
+  sequencerZoomX: number;
+  sequencerZoomY: number;
+  sequencerScrollX: number;
+  sequencerScrollY: number;
+  sequencerSnapSize: number;
 };
 
 export type SingingStoreTypes = {
@@ -743,6 +748,41 @@ export type SingingStoreTypes = {
     action(payload: { position: number }): void;
   };
 
+  ADD_NOTE: {
+    mutation: { note: Note };
+    action(payload: { note: Note }): void;
+  };
+
+  CHANGE_NOTE: {
+    mutation: { index: number; note: Note };
+    action(payload: { index: number; note: Note }): void;
+  };
+
+  REMOVE_NOTE: {
+    mutation: { index: number };
+    action(payload: { index: number }): void;
+  };
+
+  SET_ZOOM_X: {
+    mutation: { zoomX: number };
+    action(payload: { zoomX: number }): void;
+  };
+
+  SET_ZOOM_Y: {
+    mutation: { zoomY: number };
+    action(payload: { zoomY: number }): void;
+  };
+
+  SET_SCROLL_X: {
+    mutation: { scrollX: number };
+    action(payload: { scrollX: number }): void;
+  };
+
+  SET_SCROLL_Y: {
+    mutation: { scrollY: number };
+    action(payload: { scrollY: number }): void;
+  };
+
   IMPORT_MIDI_FILE: {
     action(payload: { filePath?: string }): void;
   };
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index c92b09a91e..5a854f3235 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -48,22 +48,13 @@ export default defineComponent({
 
     // 歌声合成エディターの初期化
     onMounted(async () => {
+      if (store.state.score === undefined) {
+        const emptyScore = await store.dispatch("GET_EMPTY_SCORE");
+        await store.dispatch("SET_SCORE", { score: emptyScore });
+      }
       await store.dispatch("SET_SINGER", {});
-
-      const score = await store.dispatch("GET_EMPTY_SCORE");
-
-      // 実装時の確認用です TODO: 必要なくなったら削除
-      score.notes = [
-        { position: 0, duration: 480, midi: 60, lyric: "ら" },
-        { position: 480, duration: 480, midi: 62, lyric: "ら" },
-        { position: 960, duration: 480, midi: 64, lyric: "ら" },
-        { position: 1440, duration: 480, midi: 65, lyric: "ら" },
-        { position: 1920, duration: 1920, midi: 67, lyric: "ら" },
-      ];
-
-      await store.dispatch("SET_SCORE", { score });
+      return {};
     });
-    return null;
   },
 });
 </script>
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index cbd8c62647..2b81e5c4d5 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -119,6 +119,11 @@ describe("store/vuex.js test", () => {
           tweakableSliderByScroll: false,
         },
         isShowSinger: true,
+        sequencerZoomX: 1,
+        sequencerZoomY: 1,
+        sequencerScrollX: 0,
+        sequencerScrollY: 60,
+        sequencerSnapSize: 120,
       },
       getters: {
         ...uiStore.getters,

From 7bce3e3c45d0950d0c4738c4a60d776d60a47f31 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 2 Mar 2023 02:10:57 +0900
Subject: [PATCH 09/59] =?UTF-8?q?[project-s]=E5=86=8D=E7=94=9F=E5=91=A8?=
 =?UTF-8?q?=E3=82=8A=E3=81=AE=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=20(#1184)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 位置（ティック）と時間（秒）を相互に変換する機能を追加

* 再生（スケジューリング）を行う機能を追加

* 再生位置（分 : 秒 . ミリ秒）を表示する機能を追加

* 音量を設定する機能を追加

* シンセで簡易的に再生する機能を追加（編集時に反映）

* 先頭のテンポ・拍子を削除した時にデフォルト値が追加されない不具合を修正

* リファクタリング
---
 src/components/Sing/ToolBar.vue      | 124 +++++--
 src/helpers/singHelper.ts            |   5 +
 src/infrastructures/AudioRenderer.ts | 509 +++++++++++++++++++++++++++
 src/store/singing.ts                 | 437 ++++++++++++++++++++---
 src/store/type.ts                    |  35 ++
 src/views/SingerHome.vue             |   3 +
 tests/unit/store/Vuex.spec.ts        |   2 +
 7 files changed, 1042 insertions(+), 73 deletions(-)
 create mode 100644 src/infrastructures/AudioRenderer.ts

diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index edadfece9b..c4b9765211 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -8,9 +8,29 @@
       <img :src="selectedStyleIconPath" class="singer-avatar" />
     </div>
     <div class="sing-player">
-      <button type="button" class="sing-button-temp">戻る</button>
-      <button type="button" class="sing-button-temp">再生</button>
-      <div class="sing-player-position">00:00</div>
+      <q-btn
+        flat
+        round
+        class="sing-transport-button"
+        icon="skip_previous"
+        @click="seek(0)"
+      ></q-btn>
+      <q-btn
+        v-if="!nowPlaying"
+        round
+        class="sing-playback-button"
+        icon="play_arrow"
+        @click="play"
+      ></q-btn>
+      <q-btn
+        v-else
+        round
+        class="sing-playback-button"
+        icon="stop"
+        @click="stop"
+      ></q-btn>
+      <q-btn flat round class="sing-transport-button" icon="loop"></q-btn>
+      <div class="sing-playback-position">{{ playbackPositionStr }}</div>
       <q-input
         type="number"
         :model-value="tempoInputBuffer"
@@ -18,7 +38,7 @@
         hide-bottom-space
         class="sing-tempo"
         @update:model-value="setTempoInputBuffer"
-        @change="setTempo()"
+        @change="setTempo"
       >
         <template v-slot:prepend>
           <div />
@@ -31,7 +51,7 @@
         hide-bottom-space
         class="sing-time-signature"
         @update:model-value="setBeatsInputBuffer"
-        @change="setTimeSignature()"
+        @change="setTimeSignature"
       >
         <template v-slot:prepend>
           <div />
@@ -45,7 +65,7 @@
         hide-bottom-space
         class="sing-time-signature"
         @update:model-value="setBeatTypeInputBuffer"
-        @change="setTimeSignature()"
+        @change="setTimeSignature"
       >
         <template v-slot:prepend>
           <div />
@@ -53,7 +73,7 @@
       </q-input>
     </div>
     <div class="sing-setting">
-      <input type="range" min="0" max="100" class="sing-volume" />
+      <q-slider v-model.number="volume" class="sing-volume" />
       <select class="sing-snap">
         <option>1/16</option>
       </select>
@@ -103,24 +123,43 @@ export default defineComponent({
     const beatsInputBuffer = ref(0);
     const beatTypeInputBuffer = ref(0);
 
-    const setTempoInputBuffer = (tempoStr: string) => {
+    const setTempoInputBuffer = (tempoStr: string | number | null) => {
       const tempo = Number(tempoStr);
-      if (Number.isNaN(tempo) || tempo <= 0) return;
+      if (!Number.isFinite(tempo) || tempo <= 0) return;
       tempoInputBuffer.value = tempo;
     };
-    const setBeatsInputBuffer = (beatsStr: string) => {
+    const setBeatsInputBuffer = (beatsStr: string | number | null) => {
       const beats = Number(beatsStr);
       if (!Number.isInteger(beats) || beats <= 0) return;
       beatsInputBuffer.value = beats;
     };
-    const setBeatTypeInputBuffer = (beatTypeStr: string) => {
+    const setBeatTypeInputBuffer = (beatTypeStr: string | number | null) => {
       const beatType = Number(beatTypeStr);
       if (!Number.isInteger(beatType) || beatType <= 0) return;
       beatTypeInputBuffer.value = beatType;
     };
 
+    const playPos = ref(0);
+
+    const playbackPositionStr = computed(() => {
+      let playTime = 0;
+      if (store.state.score) {
+        playTime = store.getters.POSITION_TO_TIME(playPos.value);
+      }
+
+      const intPlayTime = Math.floor(playTime);
+      const min = Math.floor(intPlayTime / 60);
+      const minStr = String(min).padStart(2, "0");
+      const secStr = String(intPlayTime - min * 60).padStart(2, "0");
+      const match = String(playTime).match(/\.(\d+)$/);
+      const milliSecStr = (match?.[1] ?? "0").padEnd(3, "0").substring(0, 3);
+
+      return `${minStr}:${secStr}.${milliSecStr}`;
+    });
+
     const tempos = computed(() => store.state.score?.tempos);
     const timeSignatures = computed(() => store.state.score?.timeSignatures);
+    const nowPlaying = computed(() => store.state.nowPlaying);
 
     watch(
       tempos,
@@ -133,17 +172,26 @@ export default defineComponent({
       timeSignatures,
       () => {
         beatsInputBuffer.value = timeSignatures.value?.[0].beats ?? 0;
-      },
-      { deep: true }
-    );
-    watch(
-      timeSignatures,
-      () => {
         beatTypeInputBuffer.value = timeSignatures.value?.[0].beatType ?? 0;
       },
       { deep: true }
     );
 
+    const timeout = 1 / 60;
+    let timeoutId: number | undefined = undefined;
+    watch(nowPlaying, (newState) => {
+      if (newState) {
+        const updateView = () => {
+          playPos.value = store.getters.GET_PLAYBACK_POSITION();
+          timeoutId = window.setTimeout(updateView, timeout);
+        };
+        updateView();
+      } else if (timeoutId !== undefined) {
+        window.clearTimeout(timeoutId);
+        timeoutId = undefined;
+      }
+    });
+
     const setTempo = async () => {
       const tempo = tempoInputBuffer.value;
       if (tempo === 0) return;
@@ -168,6 +216,28 @@ export default defineComponent({
       });
     };
 
+    const play = () => {
+      store.dispatch("SING_PLAY_AUDIO");
+    };
+
+    const stop = () => {
+      store.dispatch("SING_STOP_AUDIO");
+    };
+
+    const seek = async (position: number) => {
+      await store.dispatch("SET_PLAYBACK_POSITION", { position });
+      playPos.value = position;
+    };
+
+    const volume = computed({
+      get() {
+        return store.state.volume * 100;
+      },
+      set(value: number) {
+        store.dispatch("SET_VOLUME", { volume: value / 100 });
+      },
+    });
+
     return {
       isShowSinger,
       toggleShowSinger,
@@ -180,6 +250,12 @@ export default defineComponent({
       setBeatTypeInputBuffer,
       setTempo,
       setTimeSignature,
+      playbackPositionStr,
+      nowPlaying,
+      play,
+      stop,
+      seek,
+      volume,
     };
   },
 });
@@ -228,12 +304,17 @@ export default defineComponent({
   display: flex;
 }
 
-.sing-button-temp {
+.sing-transport-button {
+  margin: 0 1px;
+}
+
+.sing-playback-button {
   margin: 0 4px;
 }
 
 .sing-tempo {
-  margin: 0 4px;
+  margin-left: 16px;
+  margin-right: 4px;
   width: 64px;
 }
 
@@ -242,9 +323,10 @@ export default defineComponent({
   width: 36px;
 }
 
-.sing-player-position {
+.sing-playback-position {
   font-size: 18px;
   margin: 0 4px;
+  min-width: 82px;
 }
 
 .sing-setting {
@@ -254,7 +336,7 @@ export default defineComponent({
 }
 
 .sing-volume {
-  margin-right: 4px;
+  margin-right: 10px;
   width: 72px;
 }
 </style>
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index cfe517eb64..f55e41c3e7 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -61,3 +61,8 @@ export const midiKeys = [...Array(128)]
     };
   })
   .reverse();
+
+export function round(value: number, digits: number) {
+  const powerOf10 = 10 ** digits;
+  return Math.round(value * powerOf10) / powerOf10;
+}
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
new file mode 100644
index 0000000000..2dcbeef549
--- /dev/null
+++ b/src/infrastructures/AudioRenderer.ts
@@ -0,0 +1,509 @@
+class Timer {
+  private timeoutId?: number;
+
+  constructor(interval: number, callback: () => void) {
+    const tick = () => {
+      callback();
+      this.timeoutId = window.setTimeout(tick, interval);
+    };
+    tick();
+  }
+
+  dispose() {
+    if (this.timeoutId !== undefined) {
+      window.clearTimeout(this.timeoutId);
+      this.timeoutId = undefined;
+    }
+  }
+}
+
+type SchedulableEvent = {
+  readonly time: number;
+  readonly schedule: (contextTime: number) => void;
+};
+
+export interface SoundSequence {
+  generateEvents(startTime: number): SchedulableEvent[];
+  scheduleStop(contextTime: number): void;
+}
+
+class SoundScheduler {
+  readonly sequence: SoundSequence;
+  private readonly startContextTime: number;
+  private readonly startTime: number;
+  private readonly events: SchedulableEvent[];
+
+  private index = 0;
+
+  constructor(
+    sequence: SoundSequence,
+    startContextTime: number,
+    startTime: number
+  ) {
+    this.sequence = sequence;
+    this.startContextTime = startContextTime;
+    this.startTime = startTime;
+    this.events = this.sequence.generateEvents(startTime);
+  }
+
+  private calculateContextTime(time: number) {
+    return this.startContextTime + (time - this.startTime);
+  }
+
+  // `time`から`time + period`までの範囲のイベントをスケジュールする
+  scheduleEvents(time: number, period: number) {
+    if (time < this.startTime) {
+      throw new Error("The specified time is invalid.");
+    }
+
+    while (this.index < this.events.length) {
+      const event = this.events[this.index];
+      const eventContextTime = this.calculateContextTime(event.time);
+
+      if (event.time < time + period) {
+        event.schedule(eventContextTime);
+        this.index++;
+      } else break;
+    }
+  }
+
+  stop(contextTime: number) {
+    this.sequence.scheduleStop(contextTime);
+  }
+}
+
+/**
+ * 登録されているシーケンスのイベントをスケジュールし、再生を行います。
+ */
+export class Transport {
+  private readonly audioContext: AudioContext;
+  private readonly timer: Timer;
+  private readonly lookAhead: number;
+
+  private _state: "started" | "stopped" = "stopped";
+  private _time = 0;
+  private sequences: SoundSequence[] = [];
+
+  private startContextTime = 0;
+  private startTime = 0;
+  private schedulers: SoundScheduler[] = [];
+  private schedulersToBeStopped: SoundScheduler[] = [];
+
+  get state() {
+    return this._state;
+  }
+
+  get time() {
+    if (this._state === "started") {
+      const contextTime = this.audioContext.currentTime;
+      this._time = this.calculateTime(contextTime);
+    }
+    return this._time;
+  }
+
+  set time(value: number) {
+    if (this._state === "started") {
+      this.stop();
+      this._time = value;
+      this.start();
+    } else {
+      this._time = value;
+    }
+  }
+
+  /**
+   * @param audioContext コンテキスト時間の取得に使用するAudioContext。
+   * @param interval スケジューリングを行う間隔。
+   * @param lookAhead スケジューリングで先読みする時間。スケジューリングが遅れた場合でも正しく再生されるように、スケジューリングを行う間隔より長く設定する必要があります。
+   */
+  constructor(audioContext: AudioContext, interval: number, lookAhead: number) {
+    if (lookAhead <= interval) {
+      throw new Error("Look-ahead time must be longer than the interval.");
+    }
+
+    this.audioContext = audioContext;
+    this.lookAhead = lookAhead;
+    this.timer = new Timer(interval * 1000, () => {
+      if (this._state === "started") {
+        const contextTime = this.audioContext.currentTime;
+        this.scheduleEvents(contextTime);
+      }
+    });
+  }
+
+  private calculateTime(contextTime: number) {
+    const elapsedTime = contextTime - this.startContextTime;
+    return this.startTime + elapsedTime;
+  }
+
+  private getScheduler(sequence: SoundSequence) {
+    return this.schedulers.find((value) => {
+      return value.sequence === sequence;
+    });
+  }
+
+  private scheduleEvents(contextTime: number) {
+    const time = this.calculateTime(contextTime);
+
+    this.schedulersToBeStopped.forEach((value) => {
+      value.stop(contextTime);
+    });
+    this.schedulersToBeStopped = [];
+
+    this.sequences.forEach((value) => {
+      let scheduler = this.getScheduler(value);
+      if (!scheduler) {
+        scheduler = new SoundScheduler(value, contextTime, time);
+        this.schedulers.push(scheduler);
+      }
+      scheduler.scheduleEvents(time, this.lookAhead);
+    });
+  }
+
+  /**
+   * シーケンスを追加します。再生中に追加した場合は、次のスケジューリングで反映されます。
+   */
+  addSequence(sequence: SoundSequence) {
+    const exists = this.sequences.some((value) => {
+      return value === sequence;
+    });
+    if (exists) {
+      throw new Error("The specified sequence has already been added.");
+    }
+    this.sequences.push(sequence);
+  }
+
+  /**
+   * シーケンスを削除します。再生中に削除した場合は、次のスケジューリングで反映されます。
+   */
+  removeSequence(sequence: SoundSequence) {
+    const index = this.sequences.findIndex((value) => {
+      return value === sequence;
+    });
+    if (index === -1) {
+      throw new Error("The specified sequence does not exist.");
+    }
+    this.sequences.splice(index, 1);
+
+    if (this.state === "started") {
+      const index = this.schedulers.findIndex((value) => {
+        return value.sequence === sequence;
+      });
+      if (index === -1) return;
+
+      const removedScheduler = this.schedulers.splice(index, 1)[0];
+      this.schedulersToBeStopped.push(removedScheduler);
+    }
+  }
+
+  start() {
+    if (this._state === "started") return;
+    const contextTime = this.audioContext.currentTime;
+
+    this._state = "started";
+
+    this.startContextTime = contextTime;
+    this.startTime = this._time;
+    this.schedulers = [];
+    this.schedulersToBeStopped = [];
+
+    this.scheduleEvents(contextTime);
+  }
+
+  stop() {
+    if (this._state === "stopped") return;
+    const contextTime = this.audioContext.currentTime;
+    this._time = this.calculateTime(contextTime);
+
+    this._state = "stopped";
+
+    this.schedulers.forEach((value) => {
+      value.stop(contextTime);
+    });
+    this.schedulersToBeStopped.forEach((value) => {
+      value.stop(contextTime);
+    });
+  }
+
+  dispose() {
+    if (this.state === "started") {
+      this.stop();
+    }
+    this.timer.dispose();
+  }
+}
+
+export interface Instrument {
+  noteOn(contextTime: number, midi: number): void;
+  noteOff(contextTime: number, midi: number): void;
+  allSoundOff(contextTime?: number): void;
+}
+
+export type NoteEvent = {
+  readonly noteOnTime: number;
+  readonly noteOffTime: number;
+  readonly midi: number;
+};
+
+export class NoteSequence implements SoundSequence {
+  private readonly instrument: Instrument;
+  private readonly noteEvents: NoteEvent[];
+
+  constructor(instrument: Instrument, noteEvents: NoteEvent[]) {
+    this.instrument = instrument;
+    this.noteEvents = noteEvents;
+  }
+
+  // スケジュール可能なイベントを生成する
+  generateEvents(startTime: number) {
+    return this.noteEvents
+      .sort((a, b) => a.noteOnTime - b.noteOnTime)
+      .filter((value) => value.noteOffTime > startTime)
+      .map((value): SchedulableEvent[] => [
+        {
+          time: Math.max(value.noteOnTime, startTime),
+          schedule: (contextTime: number) => {
+            this.instrument.noteOn(contextTime, value.midi);
+          },
+        },
+        {
+          time: value.noteOffTime,
+          schedule: (contextTime: number) => {
+            this.instrument.noteOff(contextTime, value.midi);
+          },
+        },
+      ])
+      .flat()
+      .sort((a, b) => a.time - b.time);
+  }
+
+  // シーケンス（楽器）の停止をスケジュールする
+  scheduleStop(contextTime: number) {
+    this.instrument.allSoundOff(contextTime);
+  }
+}
+
+export type Envelope = {
+  readonly attack: number;
+  readonly decay: number;
+  readonly sustain: number;
+  readonly release: number;
+};
+
+type SynthVoiceOptions = {
+  readonly midi: number;
+  readonly oscillatorType: OscillatorType;
+  readonly envelope: Envelope;
+};
+
+class SynthVoice {
+  readonly midi: number;
+  private readonly oscillatorNode: OscillatorNode;
+  private readonly gainNode: GainNode;
+  private readonly envelope: Envelope;
+
+  private _isActive = false;
+  private _isStopped = false;
+  private stopContextTime?: number;
+
+  get isActive() {
+    return this._isActive;
+  }
+
+  get isStopped() {
+    return this._isStopped;
+  }
+
+  constructor(audioContext: BaseAudioContext, options: SynthVoiceOptions) {
+    this.midi = options.midi;
+    this.envelope = options.envelope;
+
+    this.oscillatorNode = audioContext.createOscillator();
+    this.oscillatorNode.onended = () => {
+      this._isStopped = true;
+    };
+    this.gainNode = audioContext.createGain();
+    this.oscillatorNode.type = options.oscillatorType;
+    this.oscillatorNode.connect(this.gainNode);
+  }
+
+  private midiToFrequency(midi: number) {
+    return 440 * 2 ** ((midi - 69) / 12);
+  }
+
+  connect(inputNode: AudioNode) {
+    this.gainNode.connect(inputNode);
+  }
+
+  noteOn(contextTime: number) {
+    const t0 = contextTime;
+    const atk = this.envelope.attack;
+    const dcy = this.envelope.decay;
+    const sus = this.envelope.sustain;
+
+    this.gainNode.gain.value = 0;
+    this.gainNode.gain.setValueAtTime(0, t0);
+    this.gainNode.gain.linearRampToValueAtTime(1, t0 + atk);
+    this.gainNode.gain.setTargetAtTime(sus, t0 + atk, dcy);
+
+    const freq = this.midiToFrequency(this.midi);
+    this.oscillatorNode.frequency.value = freq;
+
+    this.oscillatorNode.start(contextTime);
+    this._isActive = true;
+  }
+
+  noteOff(contextTime: number) {
+    const t0 = contextTime;
+    const rel = this.envelope.release;
+    const stopContextTime = t0 + rel * 4;
+
+    if (
+      this.stopContextTime === undefined ||
+      stopContextTime < this.stopContextTime
+    ) {
+      this.gainNode.gain.cancelAndHoldAtTime(t0);
+      this.gainNode.gain.setTargetAtTime(0, t0, rel);
+
+      this.oscillatorNode.stop(stopContextTime);
+      this._isActive = false;
+
+      this.stopContextTime = stopContextTime;
+    }
+  }
+
+  soundOff(contextTime?: number) {
+    if (
+      contextTime === undefined ||
+      this.stopContextTime === undefined ||
+      contextTime < this.stopContextTime
+    ) {
+      this.oscillatorNode.stop(contextTime);
+      this._isActive = false;
+
+      this.stopContextTime = contextTime ?? 0;
+    }
+  }
+}
+
+export type SynthOptions = {
+  readonly volume: number;
+  readonly oscillatorType: OscillatorType;
+  readonly envelope: Envelope;
+};
+
+/**
+ * ポリフォニックなシンセサイザー。
+ */
+export class Synth implements Instrument {
+  private readonly audioContext: BaseAudioContext;
+  private readonly gainNode: GainNode;
+  private readonly oscillatorType: OscillatorType;
+  private readonly envelope: Envelope;
+
+  private voices: SynthVoice[] = [];
+
+  constructor(
+    context: Context,
+    options: SynthOptions = {
+      volume: 0.1,
+      oscillatorType: "square",
+      envelope: {
+        attack: 0.001,
+        decay: 0.1,
+        sustain: 0.7,
+        release: 0.02,
+      },
+    }
+  ) {
+    this.audioContext = context.audioContext;
+
+    this.oscillatorType = options.oscillatorType;
+    this.envelope = options.envelope;
+    this.gainNode = this.audioContext.createGain();
+    this.gainNode.gain.value = options.volume;
+  }
+
+  connect(destination: AudioNode) {
+    this.gainNode.connect(destination);
+  }
+
+  disconnect() {
+    this.gainNode.disconnect();
+  }
+
+  noteOn(contextTime: number, midi: number) {
+    const exists = this.voices.some((value) => {
+      return value.isActive && value.midi === midi;
+    });
+    if (exists) return;
+
+    const voice = new SynthVoice(this.audioContext, {
+      midi,
+      oscillatorType: this.oscillatorType,
+      envelope: this.envelope,
+    });
+    this.voices = this.voices.filter((value) => {
+      return !value.isStopped;
+    });
+    this.voices.push(voice);
+    voice.connect(this.gainNode);
+    voice.noteOn(contextTime);
+  }
+
+  noteOff(contextTime: number, midi: number) {
+    const voice = this.voices.find((value) => {
+      return value.isActive && value.midi === midi;
+    });
+    if (!voice) return;
+
+    voice.noteOff(contextTime);
+  }
+
+  allSoundOff(contextTime?: number) {
+    if (contextTime === undefined) {
+      this.voices.forEach((value) => {
+        value.soundOff();
+      });
+      this.voices = [];
+    } else {
+      this.voices.forEach((value) => {
+        value.soundOff(contextTime);
+      });
+    }
+  }
+}
+
+export type Context = {
+  readonly audioContext: BaseAudioContext;
+  readonly transport: Transport;
+};
+
+export class AudioRenderer {
+  private readonly onlineContext: {
+    readonly audioContext: AudioContext;
+    readonly transport: Transport;
+  };
+
+  get context(): Context {
+    return {
+      audioContext: this.onlineContext.audioContext,
+      transport: this.onlineContext.transport,
+    };
+  }
+
+  get transport() {
+    return this.onlineContext.transport;
+  }
+
+  constructor() {
+    const audioContext = new AudioContext();
+    const transport = new Transport(audioContext, 0.2, 0.6);
+    this.onlineContext = { audioContext, transport };
+  }
+
+  dispose() {
+    this.onlineContext.transport.dispose();
+    this.onlineContext.audioContext.close();
+  }
+}
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 497722b22c..cddd50d96f 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,3 +1,12 @@
+import {
+  AudioRenderer,
+  Context,
+  NoteEvent,
+  NoteSequence,
+  SoundSequence,
+  Synth,
+  Transport,
+} from "@/infrastructures/AudioRenderer";
 import {
   Score,
   Tempo,
@@ -9,7 +18,206 @@ import {
 import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
 import { Midi } from "@tonejs/midi";
-import { getDoremiFromMidi } from "@/helpers/singHelper";
+import { getDoremiFromMidi, round } from "@/helpers/singHelper";
+
+const ticksToSecondsForConstantBpm = (
+  resolution: number,
+  bpm: number,
+  ticks: number
+) => {
+  const ticksPerBeat = resolution;
+  const beatsPerSecond = bpm / 60;
+  return ticks / ticksPerBeat / beatsPerSecond;
+};
+
+const secondsToTickForConstantBpm = (
+  resolution: number,
+  bpm: number,
+  seconds: number
+) => {
+  const ticksPerBeat = resolution;
+  const beatsPerSecond = bpm / 60;
+  return seconds * beatsPerSecond * ticksPerBeat;
+};
+
+const ticksToSeconds = (resolution: number, tempos: Tempo[], ticks: number) => {
+  let timeOfTempo = 0;
+  let tempo = tempos[tempos.length - 1];
+  for (let i = 0; i < tempos.length; i++) {
+    if (i === tempos.length - 1) {
+      break;
+    }
+    if (tempos[i + 1].position > ticks) {
+      tempo = tempos[i];
+      break;
+    }
+    timeOfTempo += ticksToSecondsForConstantBpm(
+      resolution,
+      tempos[i].tempo,
+      tempos[i + 1].position - tempos[i].position
+    );
+  }
+  return (
+    timeOfTempo +
+    ticksToSecondsForConstantBpm(
+      resolution,
+      tempo.tempo,
+      ticks - tempo.position
+    )
+  );
+};
+
+const secondsToTicks = (
+  resolution: number,
+  tempos: Tempo[],
+  seconds: number
+) => {
+  let timeOfTempo = 0;
+  let tempo = tempos[tempos.length - 1];
+  for (let i = 0; i < tempos.length; i++) {
+    if (i === tempos.length - 1) {
+      break;
+    }
+    const timeOfNextTempo =
+      timeOfTempo +
+      ticksToSecondsForConstantBpm(
+        resolution,
+        tempos[i].tempo,
+        tempos[i + 1].position - tempos[i].position
+      );
+    if (timeOfNextTempo > seconds) {
+      tempo = tempos[i];
+      break;
+    }
+    timeOfTempo = timeOfNextTempo;
+  }
+  return (
+    tempo.position +
+    secondsToTickForConstantBpm(resolution, tempo.tempo, seconds - timeOfTempo)
+  );
+};
+
+type ChannelOptions = {
+  readonly volume: number;
+};
+
+class SingChannel {
+  private readonly context: Context;
+  private readonly synth: Synth;
+  private readonly gainNode: GainNode;
+
+  private sequence?: SoundSequence;
+
+  get volume() {
+    return this.gainNode.gain.value;
+  }
+
+  set volume(value: number) {
+    this.gainNode.gain.value = value;
+  }
+
+  constructor(context: Context, options: ChannelOptions = { volume: 0.1 }) {
+    this.context = context;
+    const audioContext = context.audioContext;
+
+    this.synth = new Synth(context);
+    this.gainNode = audioContext.createGain();
+
+    this.synth.connect(this.gainNode);
+    this.gainNode.connect(audioContext.destination);
+
+    this.gainNode.gain.value = options.volume;
+  }
+
+  setNoteEvents(noteEvents: NoteEvent[]) {
+    if (this.sequence) {
+      this.context.transport.removeSequence(this.sequence);
+    }
+    const sequence = new NoteSequence(this.synth, noteEvents);
+    this.context.transport.addSequence(sequence);
+    this.sequence = sequence;
+  }
+
+  dispose() {
+    if (this.sequence) {
+      this.context.transport.removeSequence(this.sequence);
+    }
+  }
+}
+
+const isValidTempo = (tempo: Tempo) => {
+  return (
+    Number.isInteger(tempo.position) &&
+    Number.isFinite(tempo.tempo) &&
+    tempo.position >= 0 &&
+    tempo.tempo > 0
+  );
+};
+
+const isValidTimeSignature = (timeSignature: TimeSignature) => {
+  return (
+    Number.isInteger(timeSignature.position) &&
+    Number.isInteger(timeSignature.beats) &&
+    Number.isInteger(timeSignature.beatType) &&
+    timeSignature.position >= 0 &&
+    timeSignature.beats > 0 &&
+    timeSignature.beatType > 0
+  );
+};
+
+const isValidNote = (note: Note) => {
+  return (
+    Number.isInteger(note.position) &&
+    Number.isInteger(note.duration) &&
+    Number.isInteger(note.midi) &&
+    note.position >= 0 &&
+    note.duration > 0 &&
+    note.midi >= 0 &&
+    note.midi <= 127
+  );
+};
+
+/**
+ * ノートオンの時間とノートオフの時間を計算し、ノートイベントを生成します。
+ */
+const generateNoteEvents = (score: Score, notes: Note[]) => {
+  const resolution = score.resolution;
+  const tempos = score.tempos;
+  return notes.map((value): NoteEvent => {
+    const noteOnPos = value.position;
+    const noteOffPos = value.position + value.duration;
+    return {
+      midi: value.midi,
+      noteOnTime: ticksToSeconds(resolution, tempos, noteOnPos),
+      noteOffTime: ticksToSeconds(resolution, tempos, noteOffPos),
+    };
+  });
+};
+
+const getFromOptional = <T>(value: T | undefined): T => {
+  if (value === undefined) {
+    throw new Error("The value is undefined.");
+  }
+  return value;
+};
+
+const DEFAULT_RESOLUTION = 480;
+const DEFAULT_TEMPO = 120;
+const DEFAULT_BEATS = 4;
+const DEFAULT_BEAT_TYPE = 4;
+
+let audioRenderer: AudioRenderer | undefined;
+let transport: Transport | undefined;
+let singChannel: SingChannel | undefined;
+
+// テスト時はAudioContextが存在しないのでAudioRendererを作らない
+if (window.AudioContext) {
+  audioRenderer = new AudioRenderer();
+  transport = audioRenderer.transport;
+  singChannel = new SingChannel(audioRenderer.context);
+}
+
+let playbackPosition = 0;
 
 export const singingStoreState: SingingStoreState = {
   engineId: undefined,
@@ -23,6 +231,8 @@ export const singingStoreState: SingingStoreState = {
   sequencerScrollY: 60, // Y軸 midi number
   sequencerScrollX: 0, // X軸 midi duration(仮)
   sequencerSnapSize: 120, // スナップサイズ 試行用で1/16(ppq=480)のmidi durationで固定
+  nowPlaying: false,
+  volume: 0,
 };
 
 export const singingStore = createPartialStore<SingingStoreTypes>({
@@ -87,10 +297,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   GET_EMPTY_SCORE: {
     async action() {
-      const score: Score = {
-        resolution: 480,
-        tempos: [{ position: 0, tempo: 120 }],
-        timeSignatures: [{ position: 0, beats: 4, beatType: 4 }],
+      const score = {
+        resolution: DEFAULT_RESOLUTION,
+        tempos: [{ position: 0, tempo: DEFAULT_TEMPO }],
+        timeSignatures: [
+          { position: 0, beats: DEFAULT_BEATS, beatType: DEFAULT_BEAT_TYPE },
+        ],
         notes: [],
       };
       if (score.tempos.length !== 1 || score.tempos[0].position !== 0) {
@@ -112,29 +324,42 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     mutation(state, { score }: { score: Score }) {
       state.score = score;
     },
-    async action({ commit }, { score }: { score: Score }) {
+    async action({ state, getters, commit, dispatch }, { score }) {
       console.log(score);
+      if (!transport || !singChannel) {
+        throw new Error("transport or singChannel is undefined.");
+      }
+      if (state.nowPlaying) {
+        await dispatch("SING_STOP_AUDIO");
+      }
+
       commit("SET_SCORE", { score });
+
+      const noteEvents = generateNoteEvents(score, score.notes);
+      singChannel.setNoteEvents(noteEvents);
+
+      transport.time = getters.POSITION_TO_TIME(playbackPosition);
     },
   },
 
   SET_TEMPO: {
     mutation(state, { index, tempo }: { index: number; tempo: Tempo }) {
-      state.score?.tempos.splice(index, 0, tempo);
+      const score = getFromOptional(state.score);
+      const tempos = [...score.tempos];
+      tempos.splice(index, 0, tempo);
+      score.tempos = tempos;
     },
     // テンポを設定する。既に同じ位置にテンポが存在する場合は置き換える。
-    async action({ state, commit }, { tempo }: { tempo: Tempo }) {
+    async action({ state, getters, commit }, { tempo }) {
       const score = state.score;
       if (score === undefined || score.tempos.length === 0) {
         throw new Error("Score is not initialized.");
       }
-      if (
-        Number.isNaN(tempo.position) ||
-        tempo.position < 0 ||
-        Number.isNaN(tempo.tempo) ||
-        tempo.tempo <= 0
-      ) {
-        throw new Error("The value is invalid.");
+      if (!transport || !singChannel) {
+        throw new Error("transport or singChannel is undefined.");
+      }
+      if (!isValidTempo(tempo)) {
+        throw new Error("The tempo is invalid.");
       }
       const duplicate = score.tempos.some((value) => {
         return value.position === tempo.position;
@@ -144,29 +369,33 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       });
       if (index === -1) return;
 
-      const round = (value: number, digits: number) => {
-        const powerOf10 = 10 ** digits;
-        return Math.round(value * powerOf10) / powerOf10;
-      };
-
       tempo.tempo = round(tempo.tempo, 2);
 
+      if (state.nowPlaying) {
+        playbackPosition = getters.TIME_TO_POSITION(transport.time);
+      }
+
       if (duplicate) {
         commit("REMOVE_TEMPO", { index });
       }
       commit("SET_TEMPO", { index, tempo });
+
+      const noteEvents = generateNoteEvents(score, score.notes);
+      singChannel.setNoteEvents(noteEvents);
+
+      transport.time = getters.POSITION_TO_TIME(playbackPosition);
     },
   },
 
   REMOVE_TEMPO: {
     mutation(state, { index }: { index: number }) {
-      state.score?.tempos.splice(index, 1);
+      const score = getFromOptional(state.score);
+      const tempos = [...score.tempos];
+      tempos.splice(index, 1);
+      score.tempos = tempos;
     },
     // テンポを削除する。先頭のテンポの場合はデフォルトのテンポに置き換える。
-    async action(
-      { state, commit, dispatch },
-      { position }: { position: number }
-    ) {
+    async action({ state, getters, commit, dispatch }, { position }) {
       const emptyScore = await dispatch("GET_EMPTY_SCORE");
       const defaultTempo = emptyScore.tempos[0];
 
@@ -174,15 +403,27 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (score === undefined || score.tempos.length === 0) {
         throw new Error("Score is not initialized.");
       }
+      if (!transport || !singChannel) {
+        throw new Error("transport or singChannel is undefined.");
+      }
       const index = score.tempos.findIndex((value) => {
         return value.position === position;
       });
       if (index === -1) return;
 
+      if (state.nowPlaying) {
+        playbackPosition = getters.TIME_TO_POSITION(transport.time);
+      }
+
       commit("REMOVE_TEMPO", { index });
-      if (score.tempos.length === 0) {
+      if (index === 0) {
         commit("SET_TEMPO", { index, tempo: defaultTempo });
       }
+
+      const noteEvents = generateNoteEvents(score, score.notes);
+      singChannel.setNoteEvents(noteEvents);
+
+      transport.time = getters.POSITION_TO_TIME(playbackPosition);
     },
   },
 
@@ -191,7 +432,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state,
       { index, timeSignature }: { index: number; timeSignature: TimeSignature }
     ) {
-      state.score?.timeSignatures.splice(index, 0, timeSignature);
+      const score = getFromOptional(state.score);
+      const timeSignatures = [...score.timeSignatures];
+      timeSignatures.splice(index, 0, timeSignature);
+      score.timeSignatures = timeSignatures;
     },
     // 拍子を設定する。既に同じ位置に拍子が存在する場合は置き換える。
     async action(
@@ -202,15 +446,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (score === undefined || score.timeSignatures.length === 0) {
         throw new Error("Score is not initialized.");
       }
-      if (
-        Number.isNaN(timeSignature.position) ||
-        timeSignature.position < 0 ||
-        !Number.isInteger(timeSignature.beats) ||
-        !Number.isInteger(timeSignature.beatType) ||
-        timeSignature.beats <= 0 ||
-        timeSignature.beatType <= 0
-      ) {
-        throw new Error("The value is invalid.");
+      if (!isValidTimeSignature(timeSignature)) {
+        throw new Error("The time signature is invalid.");
       }
       const duplicate = score.timeSignatures.some((value) => {
         return value.position === timeSignature.position;
@@ -229,13 +466,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   REMOVE_TIME_SIGNATURE: {
     mutation(state, { index }: { index: number }) {
-      state.score?.timeSignatures.splice(index, 1);
+      const score = getFromOptional(state.score);
+      const timeSignatures = [...score.timeSignatures];
+      timeSignatures.splice(index, 1);
+      score.timeSignatures = timeSignatures;
     },
     // 拍子を削除する。先頭の拍子の場合はデフォルトの拍子に置き換える。
-    async action(
-      { state, commit, dispatch },
-      { position }: { position: number }
-    ) {
+    async action({ state, commit, dispatch }, { position }) {
       const emptyScore = await dispatch("GET_EMPTY_SCORE");
       const defaultTimeSignature = emptyScore.timeSignatures[0];
 
@@ -249,7 +486,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (index === -1) return;
 
       commit("REMOVE_TIME_SIGNATURE", { index });
-      if (score.timeSignatures.length === 0) {
+      if (index === 0) {
         commit("SET_TIME_SIGNATURE", {
           index,
           timeSignature: defaultTimeSignature,
@@ -273,7 +510,18 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
+      if (!singChannel) {
+        throw new Error("singChannel is undefined.");
+      }
+      if (!isValidNote(note)) {
+        throw new Error("The note is invalid.");
+      }
+
       commit("ADD_NOTE", { note });
+
+      const score = getFromOptional(state.score);
+      const noteEvents = generateNoteEvents(score, score.notes);
+      singChannel.setNoteEvents(noteEvents);
     },
   },
 
@@ -292,7 +540,18 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
+      if (!singChannel) {
+        throw new Error("singChannel is undefined.");
+      }
+      if (!isValidNote(note)) {
+        throw new Error("The note is invalid.");
+      }
+
       commit("CHANGE_NOTE", { index, note });
+
+      const score = getFromOptional(state.score);
+      const noteEvents = generateNoteEvents(score, score.notes);
+      singChannel.setNoteEvents(noteEvents);
     },
   },
 
@@ -308,7 +567,15 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
+      if (!singChannel) {
+        throw new Error("singChannel is undefined.");
+      }
+
       commit("REMOVE_NOTE", { index });
+
+      const score = getFromOptional(state.score);
+      const noteEvents = generateNoteEvents(score, score.notes);
+      singChannel.setNoteEvents(noteEvents);
     },
   },
 
@@ -355,6 +622,82 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       });
     },
   },
+  POSITION_TO_TIME: {
+    getter: (state) => (position) => {
+      const score = getFromOptional(state.score);
+      return ticksToSeconds(score.resolution, score.tempos, position);
+    },
+  },
+  TIME_TO_POSITION: {
+    getter: (state) => (time) => {
+      const score = getFromOptional(state.score);
+      return secondsToTicks(score.resolution, score.tempos, time);
+    },
+  },
+  GET_PLAYBACK_POSITION: {
+    getter: (state, getters) => () => {
+      if (!transport) {
+        throw new Error("transport is undefined.");
+      }
+      if (state.nowPlaying) {
+        playbackPosition = getters.TIME_TO_POSITION(transport.time);
+      }
+      return playbackPosition;
+    },
+  },
+
+  SET_PLAYBACK_POSITION: {
+    async action({ getters }, { position }) {
+      if (!transport) {
+        throw new Error("transport is undefined.");
+      }
+      playbackPosition = position;
+
+      transport.time = getters.POSITION_TO_TIME(position);
+    },
+  },
+
+  SET_PLAYBACK_STATE: {
+    mutation(state, { nowPlaying }) {
+      state.nowPlaying = nowPlaying;
+    },
+  },
+
+  SING_PLAY_AUDIO: {
+    async action({ commit }) {
+      if (!transport) {
+        throw new Error("transport is undefined.");
+      }
+      commit("SET_PLAYBACK_STATE", { nowPlaying: true });
+
+      transport.start();
+    },
+  },
+
+  SING_STOP_AUDIO: {
+    async action({ commit }) {
+      if (!transport) {
+        throw new Error("transport is undefined.");
+      }
+      commit("SET_PLAYBACK_STATE", { nowPlaying: false });
+
+      transport.stop();
+    },
+  },
+
+  SET_VOLUME: {
+    mutation(state, { volume }) {
+      state.volume = volume;
+    },
+    async action({ commit }, { volume }) {
+      if (!singChannel) {
+        throw new Error("singChannel is undefined.");
+      }
+      commit("SET_VOLUME", { volume });
+
+      singChannel.volume = volume;
+    },
+  },
 
   IMPORT_MIDI_FILE: {
     action: createUILockAction(
@@ -387,11 +730,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return Math.max(0, endPosition - position);
         };
 
-        const round = (value: number, digits: number) => {
-          const powerOf10 = 10 ** digits;
-          return Math.round(value * powerOf10) / powerOf10;
-        };
-
         // TODO: UIで読み込むトラックを選択できるようにする
         // ひとまず1トラック目のみを読み込む
         midi.tracks[0].notes
@@ -523,11 +861,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return value;
         };
 
-        const round = (value: number, digits: number) => {
-          const powerOf10 = 10 ** digits;
-          return Math.round(value * powerOf10) / powerOf10;
-        };
-
         const getStepNumber = (stepElement: Element) => {
           const stepNumberDict: { [key: string]: number } = {
             C: 0,
diff --git a/src/store/type.ts b/src/store/type.ts
index aa1a7484a8..7dc22cdc17 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -706,6 +706,8 @@ export type SingingStoreState = {
   sequencerScrollX: number;
   sequencerScrollY: number;
   sequencerSnapSize: number;
+  nowPlaying: boolean;
+  volume: number;
 };
 
 export type SingingStoreTypes = {
@@ -790,6 +792,39 @@ export type SingingStoreTypes = {
   IMPORT_MUSICXML_FILE: {
     action(payload: { filePath?: string }): void;
   };
+
+  POSITION_TO_TIME: {
+    getter(position: number): number;
+  };
+
+  TIME_TO_POSITION: {
+    getter(time: number): number;
+  };
+
+  GET_PLAYBACK_POSITION: {
+    getter(): number;
+  };
+
+  SET_PLAYBACK_POSITION: {
+    action(payload: { position: number }): void;
+  };
+
+  SET_PLAYBACK_STATE: {
+    mutation: { nowPlaying: boolean };
+  };
+
+  SING_PLAY_AUDIO: {
+    action(): void;
+  };
+
+  SING_STOP_AUDIO: {
+    action(): void;
+  };
+
+  SET_VOLUME: {
+    mutation: { volume: number };
+    action(payload: { volume: number }): void;
+  };
 };
 
 /*
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index 5a854f3235..3851dc2e3a 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -53,6 +53,9 @@ export default defineComponent({
         await store.dispatch("SET_SCORE", { score: emptyScore });
       }
       await store.dispatch("SET_SINGER", {});
+
+      await store.dispatch("SET_VOLUME", { volume: 0.3 });
+      await store.dispatch("SET_PLAYBACK_POSITION", { position: 0 });
       return {};
     });
   },
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 2b81e5c4d5..98f981cc54 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -124,6 +124,8 @@ describe("store/vuex.js test", () => {
         sequencerScrollX: 0,
         sequencerScrollY: 60,
         sequencerSnapSize: 120,
+        nowPlaying: false,
+        volume: 0,
       },
       getters: {
         ...uiStore.getters,

From 32dbae757b041dc89c7a1404fd9e7627e7359639 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Wed, 15 Mar 2023 19:58:58 +0900
Subject: [PATCH 10/59] =?UTF-8?q?[project-s]=20=E9=9F=B3=E5=A3=B0=E3=82=92?=
 =?UTF-8?q?=E6=9B=B8=E3=81=8D=E5=87=BA=E3=81=99=E6=A9=9F=E8=83=BD=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20(#1249)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 音声を書き出す機能を追加

* 指定したサンプリング周波数で書き出せるように変更

* Update src/infrastructures/AudioRenderer.ts

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/components/Sing/MenuBar.vue      |   7 +-
 src/infrastructures/AudioRenderer.ts |  63 +++++++++-
 src/store/singing.ts                 | 181 +++++++++++++++++++++++++++
 src/store/type.ts                    |  16 +++
 src/views/SingerHome.vue             |   6 +
 tests/unit/store/Vuex.spec.ts        |   2 +
 6 files changed, 269 insertions(+), 6 deletions(-)

diff --git a/src/components/Sing/MenuBar.vue b/src/components/Sing/MenuBar.vue
index dbc125e955..1719a29c40 100644
--- a/src/components/Sing/MenuBar.vue
+++ b/src/components/Sing/MenuBar.vue
@@ -96,9 +96,8 @@ export default defineComponent({
       await store.dispatch("IMPORT_MUSICXML_FILE", {});
     };
 
-    const exportSingDataAsWaveFile = async () => {
-      return null;
-      // await store.dispatch("EXPORT_SING_DATA_AS_WAVE_FILE", {});
+    const exportWaveFile = async () => {
+      await store.dispatch("EXPORT_WAVE_FILE", {});
     };
 
     const openHelpDialog = () => {
@@ -167,7 +166,7 @@ export default defineComponent({
             type: "button",
             label: "音声を出力",
             onClick: () => {
-              exportSingDataAsWaveFile();
+              exportWaveFile();
             },
           },
         ],
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 2dcbeef549..3955c50950 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -72,10 +72,15 @@ class SoundScheduler {
   }
 }
 
+export interface BaseTransport {
+  addSequence(sequence: SoundSequence): void;
+  removeSequence(sequence: SoundSequence): void;
+}
+
 /**
  * 登録されているシーケンスのイベントをスケジュールし、再生を行います。
  */
-export class Transport {
+export class Transport implements BaseTransport {
   private readonly audioContext: AudioContext;
   private readonly timer: Timer;
   private readonly lookAhead: number;
@@ -233,6 +238,41 @@ export class Transport {
   }
 }
 
+/**
+ * 登録されているシーケンスのイベントをスケジュールします。主に保存用途です。
+ */
+export class OfflineTransport implements BaseTransport {
+  private sequences: SoundSequence[] = [];
+
+  addSequence(sequence: SoundSequence) {
+    const exists = this.sequences.some((value) => {
+      return value === sequence;
+    });
+    if (exists) {
+      throw new Error("The specified sequence has already been added.");
+    }
+    this.sequences.push(sequence);
+  }
+
+  removeSequence(sequence: SoundSequence) {
+    const index = this.sequences.findIndex((value) => {
+      return value === sequence;
+    });
+    if (index === -1) {
+      throw new Error("The specified sequence does not exist.");
+    }
+    this.sequences.splice(index, 1);
+  }
+
+  scheduleEvents(startTime: number, period: number) {
+    this.sequences.forEach((value) => {
+      const scheduler = new SoundScheduler(value, 0, startTime);
+      scheduler.scheduleEvents(0, period);
+      scheduler.stop(period);
+    });
+  }
+}
+
 export interface Instrument {
   noteOn(contextTime: number, midi: number): void;
   noteOff(contextTime: number, midi: number): void;
@@ -476,7 +516,7 @@ export class Synth implements Instrument {
 
 export type Context = {
   readonly audioContext: BaseAudioContext;
-  readonly transport: Transport;
+  readonly transport: BaseTransport;
 };
 
 export class AudioRenderer {
@@ -502,6 +542,25 @@ export class AudioRenderer {
     this.onlineContext = { audioContext, transport };
   }
 
+  renderToBuffer(
+    sampleRate: number,
+    startTime: number,
+    duration: number,
+    callback: (context: Context) => void
+  ) {
+    if (this.onlineContext.transport.state === "started") {
+      this.onlineContext.transport.stop();
+    }
+
+    const length = sampleRate * duration;
+    const audioContext = new OfflineAudioContext(2, length, sampleRate);
+    const transport = new OfflineTransport();
+
+    callback({ audioContext, transport });
+    transport.scheduleEvents(startTime, duration);
+    return audioContext.startRendering();
+  }
+
   dispose() {
     this.onlineContext.transport.dispose();
     this.onlineContext.audioContext.close();
diff --git a/src/store/singing.ts b/src/store/singing.ts
index cddd50d96f..199f5228c2 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -14,9 +14,12 @@ import {
   Note,
   SingingStoreState,
   SingingStoreTypes,
+  SaveResultObject,
 } from "./type";
+import path from "path";
 import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
+import { WriteFileErrorResult } from "@/type/preload";
 import { Midi } from "@tonejs/midi";
 import { getDoremiFromMidi, round } from "@/helpers/singHelper";
 
@@ -233,6 +236,8 @@ export const singingStoreState: SingingStoreState = {
   sequencerSnapSize: 120, // スナップサイズ 試行用で1/16(ppq=480)のmidi durationで固定
   nowPlaying: false,
   volume: 0,
+  leftLocatorPosition: 0,
+  rightLocatorPosition: 0,
 };
 
 export const singingStore = createPartialStore<SingingStoreTypes>({
@@ -657,6 +662,24 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_LEFT_LOCATOR_POSITION: {
+    mutation(state, { position }) {
+      state.leftLocatorPosition = position;
+    },
+    async action({ commit }, { position }) {
+      commit("SET_LEFT_LOCATOR_POSITION", { position });
+    },
+  },
+
+  SET_RIGHT_LOCATOR_POSITION: {
+    mutation(state, { position }) {
+      state.rightLocatorPosition = position;
+    },
+    async action({ commit }, { position }) {
+      commit("SET_RIGHT_LOCATOR_POSITION", { position });
+    },
+  },
+
   SET_PLAYBACK_STATE: {
     mutation(state, { nowPlaying }) {
       state.nowPlaying = nowPlaying;
@@ -1091,4 +1114,162 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       }
     ),
   },
+
+  EXPORT_WAVE_FILE: {
+    action: createUILockAction(
+      async (
+        { state, getters, dispatch },
+        { filePath }
+      ): Promise<SaveResultObject> => {
+        const convertToWavFileData = (audioBuffer: AudioBuffer) => {
+          const bytesPerSample = 4; // Float32
+          const formatCode = 3; // WAVE_FORMAT_IEEE_FLOAT
+
+          const numberOfChannels = audioBuffer.numberOfChannels;
+          const numberOfSamples = audioBuffer.length;
+          const sampleRate = audioBuffer.sampleRate;
+          const byteRate = sampleRate * numberOfChannels * bytesPerSample;
+          const blockSize = numberOfChannels * bytesPerSample;
+          const dataSize = numberOfSamples * numberOfChannels * bytesPerSample;
+
+          const buffer = new ArrayBuffer(44 + dataSize);
+          const dataView = new DataView(buffer);
+
+          let pos = 0;
+          const writeString = (value: string) => {
+            for (let i = 0; i < value.length; i++) {
+              dataView.setUint8(pos, value.charCodeAt(i));
+              pos += 1;
+            }
+          };
+          const writeUint32 = (value: number) => {
+            dataView.setUint32(pos, value, true);
+            pos += 4;
+          };
+          const writeUint16 = (value: number) => {
+            dataView.setUint16(pos, value, true);
+            pos += 2;
+          };
+          const writeSample = (offset: number, value: number) => {
+            dataView.setFloat32(pos + offset * 4, value, true);
+          };
+
+          writeString("RIFF");
+          writeUint32(36 + dataSize); // RIFFチャンクサイズ
+          writeString("WAVE");
+          writeString("fmt ");
+          writeUint32(16); // fmtチャンクサイズ
+          writeUint16(formatCode);
+          writeUint16(numberOfChannels);
+          writeUint32(sampleRate);
+          writeUint32(byteRate);
+          writeUint16(blockSize);
+          writeUint16(bytesPerSample * 8); // 1サンプルあたりのビット数
+          writeString("data");
+          writeUint32(dataSize);
+
+          for (let i = 0; i < numberOfChannels; i++) {
+            const channelData = audioBuffer.getChannelData(i);
+            for (let j = 0; j < numberOfSamples; j++) {
+              writeSample(j * numberOfChannels + i, channelData[j]);
+            }
+          }
+
+          return buffer;
+        };
+
+        const generateWriteErrorMessage = (
+          writeFileErrorResult: WriteFileErrorResult
+        ) => {
+          if (writeFileErrorResult.code) {
+            const code = writeFileErrorResult.code.toUpperCase();
+            if (code.startsWith("ENOSPC")) {
+              return "空き容量が足りません。";
+            }
+            if (code.startsWith("EACCES")) {
+              return "ファイルにアクセスする許可がありません。";
+            }
+          }
+          return `何らかの理由で失敗しました。${writeFileErrorResult.message}`;
+        };
+
+        if (!audioRenderer) {
+          throw new Error("audioRenderer is undefined.");
+        }
+
+        // TODO: ファイル名を設定できるようにする
+        const fileName = "test_export.wav";
+
+        const score = getFromOptional(state.score);
+        const leftLocatorPos = state.leftLocatorPosition;
+        const rightLocatorPos = state.rightLocatorPosition;
+
+        const renderStartTime = getters.POSITION_TO_TIME(leftLocatorPos);
+        const renderEndTime = getters.POSITION_TO_TIME(rightLocatorPos);
+        const renderDuration = renderEndTime - renderStartTime;
+
+        if (renderEndTime <= renderStartTime) {
+          // TODO: メッセージを表示するようにする
+          throw new Error("Invalid render range.");
+        }
+
+        if (state.nowPlaying) {
+          await dispatch("SING_STOP_AUDIO");
+        }
+
+        if (state.savingSetting.fixedExportEnabled) {
+          filePath = path.join(state.savingSetting.fixedExportDir, fileName);
+        } else {
+          filePath ??= await window.electron.showAudioSaveDialog({
+            title: "音声を保存",
+            defaultPath: fileName,
+          });
+        }
+        if (!filePath) {
+          return { result: "CANCELED", path: "" };
+        }
+
+        if (state.savingSetting.avoidOverwrite) {
+          let tail = 1;
+          const name = filePath.slice(0, filePath.length - 4);
+          while (await dispatch("CHECK_FILE_EXISTS", { file: filePath })) {
+            filePath = name + "[" + tail.toString() + "]" + ".wav";
+            tail += 1;
+          }
+        }
+
+        // TODO: レンダリングで使用したノードはdisconnectしなくても解放されるはずですが、
+        // 念のため歌声合成周りを実装後に確認した方が良いかも
+        const audioBuffer = await audioRenderer.renderToBuffer(
+          48000, // TODO: 設定できるようにする
+          renderStartTime,
+          renderDuration,
+          (context) => {
+            // SingChannelインスタンスはこの関数を抜けると解放されますが、
+            // コンテキストにはノードや発音が登録されているので問題なくレンダリングされます
+            // TODO: 分かりにくいので後でリファクタリングしたい
+            const channel = new SingChannel(context);
+            const noteEvents = generateNoteEvents(score, score.notes);
+            channel.setNoteEvents(noteEvents);
+          }
+        );
+        const waveFileData = convertToWavFileData(audioBuffer);
+
+        const writeFileResult = window.electron.writeFile({
+          filePath,
+          buffer: waveFileData,
+        }); // 失敗した場合、WriteFileErrorResultオブジェクトが返り、成功時はundefinedが反る
+        if (writeFileResult) {
+          window.electron.logError(new Error(writeFileResult.message));
+          return {
+            result: "WRITE_ERROR",
+            path: filePath,
+            errorMessage: generateWriteErrorMessage(writeFileResult),
+          };
+        }
+
+        return { result: "SUCCESS", path: filePath };
+      }
+    ),
+  },
 });
diff --git a/src/store/type.ts b/src/store/type.ts
index 7dc22cdc17..3193f38031 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -708,6 +708,8 @@ export type SingingStoreState = {
   sequencerSnapSize: number;
   nowPlaying: boolean;
   volume: number;
+  leftLocatorPosition: number;
+  rightLocatorPosition: number;
 };
 
 export type SingingStoreTypes = {
@@ -793,6 +795,10 @@ export type SingingStoreTypes = {
     action(payload: { filePath?: string }): void;
   };
 
+  EXPORT_WAVE_FILE: {
+    action(payload: { filePath?: string }): SaveResultObject;
+  };
+
   POSITION_TO_TIME: {
     getter(position: number): number;
   };
@@ -809,6 +815,16 @@ export type SingingStoreTypes = {
     action(payload: { position: number }): void;
   };
 
+  SET_LEFT_LOCATOR_POSITION: {
+    mutation: { position: number };
+    action(payload: { position: number }): void;
+  };
+
+  SET_RIGHT_LOCATOR_POSITION: {
+    mutation: { position: number };
+    action(payload: { position: number }): void;
+  };
+
   SET_PLAYBACK_STATE: {
     mutation: { nowPlaying: boolean };
   };
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index 3851dc2e3a..da0391b177 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -56,6 +56,12 @@ export default defineComponent({
 
       await store.dispatch("SET_VOLUME", { volume: 0.3 });
       await store.dispatch("SET_PLAYBACK_POSITION", { position: 0 });
+      await store.dispatch("SET_LEFT_LOCATOR_POSITION", {
+        position: 0,
+      });
+      await store.dispatch("SET_RIGHT_LOCATOR_POSITION", {
+        position: 480 * 4 * 16,
+      });
       return {};
     });
   },
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 98f981cc54..0a6dc87004 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -126,6 +126,8 @@ describe("store/vuex.js test", () => {
         sequencerSnapSize: 120,
         nowPlaying: false,
         volume: 0,
+        leftLocatorPosition: 0,
+        rightLocatorPosition: 0,
       },
       getters: {
         ...uiStore.getters,

From bef16f5dc941f14e2c36f4627fbe09973152658e Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Wed, 12 Apr 2023 01:56:06 +0900
Subject: [PATCH 11/59] =?UTF-8?q?[project-s]=20=E6=AD=8C=E3=83=9C=E5=BD=A2?=
 =?UTF-8?q?=E5=BC=8F=E3=81=A7=E6=AD=8C=E5=A3=B0=E5=90=88=E6=88=90=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1255?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 歌ボ形式で歌声合成する機能を追加

* リファクタリング

* 修正とリファクタリング

* Update src/store/singing.ts

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

* logInfoでログ出力するように変更、テキストではなく音素を出力するように変更

* 修正とリファクタリング、コメントの追加

* audioQueryCacheを削除、リファクタリングとコメントの追加

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/background.ts                       |   4 +-
 src/components/AcceptTermsDialog.vue    |   4 +-
 src/components/MinMaxCloseButtons.vue   |   4 +-
 src/components/Sing/MenuBar.vue         |   4 +
 src/helpers/singHelper.ts               |   4 +
 src/infrastructures/AudioRenderer.ts    | 150 +++++-
 src/plugins/ipcMessageReceiverPlugin.ts |   4 +-
 src/store/singing.ts                    | 623 ++++++++++++++++++++----
 src/store/type.ts                       |  39 +-
 src/store/ui.ts                         |   8 +
 src/type/ipc.ts                         |   2 +-
 src/views/SingerHome.vue                |   1 +
 tests/unit/store/Vuex.spec.ts           |   7 +-
 13 files changed, 746 insertions(+), 108 deletions(-)

diff --git a/src/background.ts b/src/background.ts
index cf03a40f9d..24a172ba15 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -861,7 +861,7 @@ async function createWindow() {
   win.on("close", (event) => {
     if (!willQuit) {
       event.preventDefault();
-      ipcMainSend(win, "CHECK_EDITED_AND_NOT_SAVE");
+      ipcMainSend(win, "PROCESS_BEFORE_QUITTING");
       return;
     }
   });
@@ -1214,7 +1214,7 @@ app.on("window-all-closed", () => {
 app.on("before-quit", (event) => {
   if (!willQuit) {
     event.preventDefault();
-    ipcMainSend(win, "CHECK_EDITED_AND_NOT_SAVE");
+    ipcMainSend(win, "PROCESS_BEFORE_QUITTING");
     return;
   }
 
diff --git a/src/components/AcceptTermsDialog.vue b/src/components/AcceptTermsDialog.vue
index 19180e5402..3188145ac1 100644
--- a/src/components/AcceptTermsDialog.vue
+++ b/src/components/AcceptTermsDialog.vue
@@ -87,7 +87,9 @@ export default defineComponent({
       store.dispatch("SET_ACCEPT_TERMS", {
         acceptTerms: acceptTerms ? "Accepted" : "Rejected",
       });
-      !acceptTerms ? store.dispatch("CHECK_EDITED_AND_NOT_SAVE") : undefined;
+      if (!acceptTerms) {
+        store.dispatch("PROCESS_BEFORE_QUITTING");
+      }
 
       modelValueComputed.value = false;
     };
diff --git a/src/components/MinMaxCloseButtons.vue b/src/components/MinMaxCloseButtons.vue
index 5a68e06f47..5975336aa0 100644
--- a/src/components/MinMaxCloseButtons.vue
+++ b/src/components/MinMaxCloseButtons.vue
@@ -95,8 +95,8 @@ export default defineComponent({
   setup() {
     const store = useStore();
 
-    const closeWindow = async () => {
-      store.dispatch("CHECK_EDITED_AND_NOT_SAVE");
+    const closeWindow = () => {
+      store.dispatch("PROCESS_BEFORE_QUITTING");
     };
     const minimizeWindow = () => window.electron.minimizeWindow();
     const maximizeWindow = () => window.electron.maximizeWindow();
diff --git a/src/components/Sing/MenuBar.vue b/src/components/Sing/MenuBar.vue
index 1719a29c40..0b1f83fcf6 100644
--- a/src/components/Sing/MenuBar.vue
+++ b/src/components/Sing/MenuBar.vue
@@ -11,6 +11,8 @@
         root.type === 'button' ? (subMenuOpenFlags[index] = false) : undefined
       "
     />
+    <q-space />
+    <min-max-close-buttons v-if="!$q.platform.is.mac" />
   </q-bar>
 </template>
 
@@ -18,6 +20,7 @@
 import { defineComponent, ref, computed, ComputedRef } from "vue";
 import { useStore } from "@/store";
 import MenuButton from "@/components/MenuButton.vue";
+import MinMaxCloseButtons from "@/components/MinMaxCloseButtons.vue";
 import { HotkeyAction, HotkeyReturnType } from "@/type/preload";
 import { setHotkeyFunctions } from "@/store/setting";
 
@@ -57,6 +60,7 @@ export default defineComponent({
 
   components: {
     MenuButton,
+    MinMaxCloseButtons,
   },
 
   setup() {
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index f55e41c3e7..7c089fc6e8 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -66,3 +66,7 @@ export function round(value: number, digits: number) {
   const powerOf10 = 10 ** digits;
   return Math.round(value * powerOf10) / powerOf10;
 }
+
+export function midiToFrequency(midi: number) {
+  return 440 * 2 ** ((midi - 69) / 12);
+}
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 3955c50950..9d05969403 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -273,6 +273,45 @@ export class OfflineTransport implements BaseTransport {
   }
 }
 
+export type AudioEvent = {
+  readonly time: number;
+  readonly buffer: AudioBuffer;
+};
+
+export class AudioSequence implements SoundSequence {
+  private readonly audioPlayer: AudioPlayer;
+  private readonly audioEvents: AudioEvent[];
+
+  constructor(audioPlayer: AudioPlayer, audioEvents: AudioEvent[]) {
+    this.audioPlayer = audioPlayer;
+    this.audioEvents = audioEvents;
+  }
+
+  // スケジュール可能なイベントを生成する
+  generateEvents(startTime: number) {
+    return this.audioEvents
+      .sort((a, b) => a.time - b.time)
+      .filter((value) => {
+        const audioEndTime = value.time + value.buffer.duration;
+        return audioEndTime > startTime;
+      })
+      .map((value): SchedulableEvent => {
+        const offset = Math.max(startTime - value.time, 0);
+        return {
+          time: Math.max(value.time, startTime),
+          schedule: (contextTime: number) => {
+            this.audioPlayer.play(contextTime, offset, value.buffer);
+          },
+        };
+      });
+  }
+
+  // シーケンスの停止をスケジュールする
+  scheduleStop(contextTime: number) {
+    this.audioPlayer.allStop(contextTime);
+  }
+}
+
 export interface Instrument {
   noteOn(contextTime: number, midi: number): void;
   noteOff(contextTime: number, midi: number): void;
@@ -317,12 +356,101 @@ export class NoteSequence implements SoundSequence {
       .sort((a, b) => a.time - b.time);
   }
 
-  // シーケンス（楽器）の停止をスケジュールする
+  // シーケンスの停止をスケジュールする
   scheduleStop(contextTime: number) {
     this.instrument.allSoundOff(contextTime);
   }
 }
 
+class AudioPlayerVoice {
+  private readonly audioBufferSourceNode: AudioBufferSourceNode;
+  private readonly buffer: AudioBuffer;
+
+  private _isStopped = false;
+  private stopContextTime?: number;
+
+  get isStopped() {
+    return this._isStopped;
+  }
+
+  constructor(audioContext: BaseAudioContext, buffer: AudioBuffer) {
+    this.audioBufferSourceNode = audioContext.createBufferSource();
+    this.audioBufferSourceNode.buffer = buffer;
+    this.audioBufferSourceNode.onended = () => {
+      this._isStopped = true;
+    };
+    this.buffer = buffer;
+  }
+
+  connect(destination: AudioNode) {
+    this.audioBufferSourceNode.connect(destination);
+  }
+
+  play(contextTime: number, offset: number) {
+    this.audioBufferSourceNode.start(contextTime, offset);
+    this.stopContextTime = contextTime + this.buffer.duration;
+  }
+
+  stop(contextTime?: number) {
+    if (this.stopContextTime === undefined) {
+      throw new Error("Not started.");
+    }
+    if (contextTime === undefined || contextTime < this.stopContextTime) {
+      this.audioBufferSourceNode.stop(contextTime);
+      this.stopContextTime = contextTime ?? 0;
+    }
+  }
+}
+
+export type AudioPlayerOptions = {
+  readonly volume: number;
+};
+
+export class AudioPlayer {
+  private readonly audioContext: BaseAudioContext;
+  private readonly gainNode: GainNode;
+
+  private voices: AudioPlayerVoice[] = [];
+
+  constructor(context: Context, options: AudioPlayerOptions = { volume: 1.0 }) {
+    this.audioContext = context.audioContext;
+
+    this.gainNode = this.audioContext.createGain();
+    this.gainNode.gain.value = options.volume;
+  }
+
+  connect(destination: AudioNode) {
+    this.gainNode.connect(destination);
+  }
+
+  disconnect() {
+    this.gainNode.disconnect();
+  }
+
+  play(contextTime: number, offset: number, buffer: AudioBuffer) {
+    const voice = new AudioPlayerVoice(this.audioContext, buffer);
+    this.voices = this.voices.filter((value) => {
+      return !value.isStopped;
+    });
+    this.voices.push(voice);
+    voice.connect(this.gainNode);
+    voice.play(contextTime, offset);
+  }
+
+  allStop(contextTime?: number) {
+    if (contextTime === undefined) {
+      this.voices.forEach((value) => {
+        value.stop();
+      });
+      this.voices = [];
+    } else {
+      this.voices.forEach((value) => {
+        value.stop(contextTime);
+      });
+    }
+  }
+}
+
 export type Envelope = {
   readonly attack: number;
   readonly decay: number;
@@ -371,8 +499,8 @@ class SynthVoice {
     return 440 * 2 ** ((midi - 69) / 12);
   }
 
-  connect(inputNode: AudioNode) {
-    this.gainNode.connect(inputNode);
+  connect(destination: AudioNode) {
+    this.gainNode.connect(destination);
   }
 
   noteOn(contextTime: number) {
@@ -532,6 +660,10 @@ export class AudioRenderer {
     };
   }
 
+  get audioContext() {
+    return this.onlineContext.audioContext;
+  }
+
   get transport() {
     return this.onlineContext.transport;
   }
@@ -542,7 +674,14 @@ export class AudioRenderer {
     this.onlineContext = { audioContext, transport };
   }
 
-  renderToBuffer(
+  async createAudioBuffer(blob: Blob) {
+    const audioContext = this.onlineContext.audioContext;
+    const arrayBuffer = await blob.arrayBuffer();
+    const audioBuffer = await audioContext.decodeAudioData(arrayBuffer);
+    return audioBuffer;
+  }
+
+  async renderToBuffer(
     sampleRate: number,
     startTime: number,
     duration: number,
@@ -558,7 +697,8 @@ export class AudioRenderer {
 
     callback({ audioContext, transport });
     transport.scheduleEvents(startTime, duration);
-    return audioContext.startRendering();
+    const audioBuffer = await audioContext.startRendering();
+    return audioBuffer;
   }
 
   dispose() {
diff --git a/src/plugins/ipcMessageReceiverPlugin.ts b/src/plugins/ipcMessageReceiverPlugin.ts
index 296e51cee2..2c66dea8f3 100644
--- a/src/plugins/ipcMessageReceiverPlugin.ts
+++ b/src/plugins/ipcMessageReceiverPlugin.ts
@@ -44,8 +44,8 @@ export const ipcMessageReceiver: Plugin = {
       options.store.dispatch("DETECT_LEAVE_FULLSCREEN")
     );
 
-    window.electron.onReceivedIPCMsg("CHECK_EDITED_AND_NOT_SAVE", () => {
-      options.store.dispatch("CHECK_EDITED_AND_NOT_SAVE");
+    window.electron.onReceivedIPCMsg("PROCESS_BEFORE_QUITTING", () => {
+      options.store.dispatch("PROCESS_BEFORE_QUITTING");
     });
 
     window.electron.onReceivedIPCMsg(
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 199f5228c2..a5b66d7b65 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,5 +1,8 @@
 import {
+  AudioEvent,
+  AudioPlayer,
   AudioRenderer,
+  AudioSequence,
   Context,
   NoteEvent,
   NoteSequence,
@@ -21,7 +24,12 @@ import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
 import { WriteFileErrorResult } from "@/type/preload";
 import { Midi } from "@tonejs/midi";
-import { getDoremiFromMidi, round } from "@/helpers/singHelper";
+import {
+  getDoremiFromMidi,
+  midiToFrequency,
+  round,
+} from "@/helpers/singHelper";
+import { AudioQuery } from "@/openapi";
 
 const ticksToSecondsForConstantBpm = (
   resolution: number,
@@ -100,16 +108,91 @@ const secondsToTicks = (
   );
 };
 
+const generateNoteEvents = (
+  resolution: number,
+  tempos: Tempo[],
+  notes: Note[]
+) => {
+  return notes.map((value): NoteEvent => {
+    const noteOnPos = value.position;
+    const noteOffPos = value.position + value.duration;
+    return {
+      midi: value.midi,
+      noteOnTime: ticksToSeconds(resolution, tempos, noteOnPos),
+      noteOffTime: ticksToSeconds(resolution, tempos, noteOffPos),
+    };
+  });
+};
+
+const copyScore = (score: Score): Score => {
+  return {
+    resolution: score.resolution,
+    tempos: score.tempos.map((value) => ({ ...value })),
+    timeSignatures: score.timeSignatures.map((value) => ({ ...value })),
+    notes: score.notes.map((value) => ({ ...value })),
+  };
+};
+
+const _generateHash = async <T>(obj: T) => {
+  const textEncoder = new TextEncoder();
+  const data = textEncoder.encode(JSON.stringify(obj));
+  const digest = await crypto.subtle.digest("SHA-256", data);
+  return Array.from(new Uint8Array(digest))
+    .map((v) => v.toString(16).padStart(2, "0"))
+    .join("");
+};
+
+const createPromiseThatResolvesWhen = (
+  condition: () => boolean,
+  interval = 200
+) => {
+  return new Promise<void>((resolve) => {
+    const checkCondition = () => {
+      if (condition()) {
+        resolve();
+      }
+      window.setTimeout(checkCondition, interval);
+    };
+    checkCondition();
+  });
+};
+
+type Singer = {
+  readonly engineId: string;
+  readonly styleId: number;
+};
+
+type Phrase = {
+  readonly singer: Singer | undefined;
+  readonly score: Score;
+  // renderingが進むに連れてデータが代入されていく
+  query?: AudioQuery;
+  queryHash?: string; // queryの変更を検知するためのハッシュ
+  buffer?: AudioBuffer;
+  startTime?: number;
+};
+
+const generateSingerAndScoreHash = async (obj: {
+  singer: Singer | undefined;
+  score: Score;
+}) => {
+  return _generateHash(obj);
+};
+
+const generateAudioQueryHash = async (obj: AudioQuery) => {
+  return _generateHash(obj);
+};
+
 type ChannelOptions = {
   readonly volume: number;
 };
 
 class SingChannel {
   private readonly context: Context;
-  private readonly synth: Synth;
   private readonly gainNode: GainNode;
 
-  private sequence?: SoundSequence;
+  private phrases: Phrase[] = [];
+  private sequences: SoundSequence[] = [];
 
   get volume() {
     return this.gainNode.gain.value;
@@ -123,28 +206,58 @@ class SingChannel {
     this.context = context;
     const audioContext = context.audioContext;
 
-    this.synth = new Synth(context);
     this.gainNode = audioContext.createGain();
-
-    this.synth.connect(this.gainNode);
     this.gainNode.connect(audioContext.destination);
-
     this.gainNode.gain.value = options.volume;
   }
 
-  setNoteEvents(noteEvents: NoteEvent[]) {
-    if (this.sequence) {
-      this.context.transport.removeSequence(this.sequence);
+  addPhrase(phrase: Phrase) {
+    this.phrases.push(phrase);
+
+    let sequence: SoundSequence | undefined;
+    if (phrase.startTime !== undefined && phrase.buffer) {
+      const audioEvents: AudioEvent[] = [
+        {
+          time: phrase.startTime,
+          buffer: phrase.buffer,
+        },
+      ];
+      const audioPlayer = new AudioPlayer(this.context);
+      audioPlayer.connect(this.gainNode);
+      sequence = new AudioSequence(audioPlayer, audioEvents);
+    } else {
+      const noteEvents = generateNoteEvents(
+        phrase.score.resolution,
+        phrase.score.tempos,
+        phrase.score.notes
+      );
+      const synth = new Synth(this.context);
+      synth.connect(this.gainNode);
+      sequence = new NoteSequence(synth, noteEvents);
     }
-    const sequence = new NoteSequence(this.synth, noteEvents);
+
     this.context.transport.addSequence(sequence);
-    this.sequence = sequence;
+    this.sequences.push(sequence);
   }
 
-  dispose() {
-    if (this.sequence) {
-      this.context.transport.removeSequence(this.sequence);
+  removePhrase(phrase: Phrase) {
+    const index = this.phrases.findIndex((value) => {
+      return value === phrase;
+    });
+    if (index === -1) {
+      throw new Error("The specified phrase does not exist.");
     }
+    this.phrases.splice(index, 1);
+
+    const sequence = this.sequences[index];
+    this.context.transport.removeSequence(sequence);
+    this.sequences.splice(index, 1);
+  }
+
+  dispose() {
+    this.sequences.forEach((value) => {
+      this.context.transport.removeSequence(value);
+    });
   }
 }
 
@@ -180,23 +293,6 @@ const isValidNote = (note: Note) => {
   );
 };
 
-/**
- * ノートオンの時間とノートオフの時間を計算し、ノートイベントを生成します。
- */
-const generateNoteEvents = (score: Score, notes: Note[]) => {
-  const resolution = score.resolution;
-  const tempos = score.tempos;
-  return notes.map((value): NoteEvent => {
-    const noteOnPos = value.position;
-    const noteOffPos = value.position + value.duration;
-    return {
-      midi: value.midi,
-      noteOnTime: ticksToSeconds(resolution, tempos, noteOnPos),
-      noteOffTime: ticksToSeconds(resolution, tempos, noteOffPos),
-    };
-  });
-};
-
 const getFromOptional = <T>(value: T | undefined): T => {
   if (value === undefined) {
     throw new Error("The value is undefined.");
@@ -221,12 +317,14 @@ if (window.AudioContext) {
 }
 
 let playbackPosition = 0;
+const allPhrases = new Map<string, Phrase>();
+
+const audioBufferCache = new Map<string, AudioBuffer>();
 
 export const singingStoreState: SingingStoreState = {
   engineId: undefined,
   styleId: undefined,
   score: undefined,
-  renderPhrases: [],
   // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
   isShowSinger: true,
   sequencerZoomX: 0.5,
@@ -238,6 +336,10 @@ export const singingStoreState: SingingStoreState = {
   volume: 0,
   leftLocatorPosition: 0,
   rightLocatorPosition: 0,
+  renderingEnabled: false,
+  startRenderingRequested: false,
+  stopRenderingRequested: false,
+  nowRendering: false,
 };
 
 export const singingStore = createPartialStore<SingingStoreTypes>({
@@ -260,10 +362,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.engineId = engineId;
       state.styleId = styleId;
     },
-    async action(
-      { state, getters, dispatch, commit },
-      payload: { engineId?: string; styleId?: number }
-    ) {
+    async action({ state, getters, dispatch, commit }, payload) {
       if (state.defaultStyleIds == undefined)
         throw new Error("state.defaultStyleIds == undefined");
       if (getters.USER_ORDERED_CHARACTER_INFOS == undefined)
@@ -296,6 +395,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         }
       } finally {
         commit("SET_SINGER", { engineId, styleId });
+
+        dispatch("RENDER");
       }
     },
   },
@@ -330,20 +431,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.score = score;
     },
     async action({ state, getters, commit, dispatch }, { score }) {
-      console.log(score);
-      if (!transport || !singChannel) {
-        throw new Error("transport or singChannel is undefined.");
+      if (!transport) {
+        throw new Error("transport is undefined.");
       }
       if (state.nowPlaying) {
         await dispatch("SING_STOP_AUDIO");
       }
-
       commit("SET_SCORE", { score });
 
-      const noteEvents = generateNoteEvents(score, score.notes);
-      singChannel.setNoteEvents(noteEvents);
-
       transport.time = getters.POSITION_TO_TIME(playbackPosition);
+
+      dispatch("RENDER");
     },
   },
 
@@ -355,13 +453,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       score.tempos = tempos;
     },
     // テンポを設定する。既に同じ位置にテンポが存在する場合は置き換える。
-    async action({ state, getters, commit }, { tempo }) {
+    async action({ state, getters, commit, dispatch }, { tempo }) {
       const score = state.score;
       if (score === undefined || score.tempos.length === 0) {
         throw new Error("Score is not initialized.");
       }
-      if (!transport || !singChannel) {
-        throw new Error("transport or singChannel is undefined.");
+      if (!transport) {
+        throw new Error("transport is undefined.");
       }
       if (!isValidTempo(tempo)) {
         throw new Error("The tempo is invalid.");
@@ -385,10 +483,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       }
       commit("SET_TEMPO", { index, tempo });
 
-      const noteEvents = generateNoteEvents(score, score.notes);
-      singChannel.setNoteEvents(noteEvents);
-
       transport.time = getters.POSITION_TO_TIME(playbackPosition);
+
+      dispatch("RENDER");
     },
   },
 
@@ -408,8 +505,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (score === undefined || score.tempos.length === 0) {
         throw new Error("Score is not initialized.");
       }
-      if (!transport || !singChannel) {
-        throw new Error("transport or singChannel is undefined.");
+      if (!transport) {
+        throw new Error("transport is undefined.");
       }
       const index = score.tempos.findIndex((value) => {
         return value.position === position;
@@ -425,10 +522,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         commit("SET_TEMPO", { index, tempo: defaultTempo });
       }
 
-      const noteEvents = generateNoteEvents(score, score.notes);
-      singChannel.setNoteEvents(noteEvents);
-
       transport.time = getters.POSITION_TO_TIME(playbackPosition);
+
+      dispatch("RENDER");
     },
   },
 
@@ -511,22 +607,16 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
     // ノートを追加する
     // NOTE: 重複削除など別途追加
-    async action({ state, commit }, { note }: { note: Note }) {
+    async action({ state, commit, dispatch }, { note }) {
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
-      if (!singChannel) {
-        throw new Error("singChannel is undefined.");
-      }
       if (!isValidNote(note)) {
         throw new Error("The note is invalid.");
       }
-
       commit("ADD_NOTE", { note });
 
-      const score = getFromOptional(state.score);
-      const noteEvents = generateNoteEvents(score, score.notes);
-      singChannel.setNoteEvents(noteEvents);
+      dispatch("RENDER");
     },
   },
 
@@ -538,25 +628,16 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         state.score.notes = notes;
       }
     },
-    async action(
-      { state, commit },
-      { index, note }: { index: number; note: Note }
-    ) {
+    async action({ state, commit, dispatch }, { index, note }) {
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
-      if (!singChannel) {
-        throw new Error("singChannel is undefined.");
-      }
       if (!isValidNote(note)) {
         throw new Error("The note is invalid.");
       }
-
       commit("CHANGE_NOTE", { index, note });
 
-      const score = getFromOptional(state.score);
-      const noteEvents = generateNoteEvents(score, score.notes);
-      singChannel.setNoteEvents(noteEvents);
+      dispatch("RENDER");
     },
   },
 
@@ -568,19 +649,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         state.score.notes = notes;
       }
     },
-    async action({ state, commit }, { index }: { index: number }) {
+    async action({ state, commit, dispatch }, { index }) {
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
-      if (!singChannel) {
-        throw new Error("singChannel is undefined.");
-      }
-
       commit("REMOVE_NOTE", { index });
 
-      const score = getFromOptional(state.score);
-      const noteEvents = generateNoteEvents(score, score.notes);
-      singChannel.setNoteEvents(noteEvents);
+      dispatch("RENDER");
     },
   },
 
@@ -722,6 +797,382 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_START_RENDERING_REQUESTED: {
+    mutation(state, { startRenderingRequested }) {
+      state.startRenderingRequested = startRenderingRequested;
+    },
+  },
+
+  SET_STOP_RENDERING_REQUESTED: {
+    mutation(state, { stopRenderingRequested }) {
+      state.stopRenderingRequested = stopRenderingRequested;
+    },
+  },
+
+  SET_NOW_RENDERING: {
+    mutation(state, { nowRendering }) {
+      state.nowRendering = nowRendering;
+    },
+  },
+
+  /**
+   * レンダリングを行う。レンダリング中だった場合は停止して再レンダリングする。
+   */
+  RENDER: {
+    async action({ state, getters, commit, dispatch }) {
+      const preProcessing = (score: Score) => {
+        const resolution = score.resolution;
+        const tempos = score.tempos;
+        const notes = score.notes;
+
+        // 重複するノートを除く
+        for (let i = 0; i < notes.length; i++) {
+          const note = notes[i];
+          if (i === 0) continue;
+          const lastNote = notes[i - 1];
+          if (note.position < lastNote.position + lastNote.duration) {
+            notes.splice(i, 1);
+            i--;
+          }
+        }
+
+        // 長いノートを短くする
+        const maxNoteTime = 0.26;
+        for (let i = 0; i < notes.length; i++) {
+          const note = notes[i];
+          const noteOnPos = note.position;
+          const noteOffPos = note.position + note.duration;
+          const noteOnTime = ticksToSeconds(resolution, tempos, noteOnPos);
+          const noteOffTime = ticksToSeconds(resolution, tempos, noteOffPos);
+
+          if (noteOffTime - noteOnTime > maxNoteTime) {
+            let noteOffPos = secondsToTicks(
+              resolution,
+              tempos,
+              noteOnTime + maxNoteTime
+            );
+            noteOffPos = Math.max(note.position + 1, Math.floor(noteOffPos));
+            note.duration = noteOffPos - note.position;
+          }
+        }
+      };
+
+      const searchPhrases = async (
+        singer: Singer | undefined,
+        score: Score
+      ) => {
+        const notes = score.notes;
+        const foundPhrases = new Map<string, Phrase>();
+        let phraseNotes: Note[] = [];
+        for (let i = 0; i < notes.length; i++) {
+          const note = notes[i];
+
+          phraseNotes.push(note);
+
+          if (
+            i === notes.length - 1 ||
+            note.position + note.duration !== notes[i + 1].position
+          ) {
+            const phraseScore = {
+              ...score,
+              notes: phraseNotes,
+            };
+            const hash = await generateSingerAndScoreHash({
+              singer,
+              score: phraseScore, // NOTE: とりあえず拍子も含めてハッシュ生成する
+            });
+            foundPhrases.set(hash, {
+              singer,
+              score: phraseScore,
+            });
+
+            phraseNotes = [];
+          }
+        }
+        return foundPhrases;
+      };
+
+      const generateAndEditQuery = async (singer: Singer, score: Score) => {
+        if (!getters.IS_ENGINE_READY(singer.engineId)) {
+          throw new Error("Engine not ready.");
+        }
+
+        const text = score.notes
+          .map((value) => value.lyric)
+          .map((value) => value.replace("は", "ハ")) // TODO: 助詞の扱いはあとで考える
+          .map((value) => value.replace("へ", "ヘ")) // TODO: 助詞の扱いはあとで考える
+          .join("");
+
+        const query = await dispatch("FETCH_AUDIO_QUERY", {
+          text,
+          engineId: singer.engineId,
+          styleId: singer.styleId,
+        });
+
+        const moras = query.accentPhrases.map((value) => value.moras).flat();
+
+        if (moras.length !== score.notes.length) {
+          throw new Error(
+            "The number of moras and the number of notes do not match."
+          );
+        }
+
+        // 音素を表示
+        const phonemes = moras
+          .map((value) => {
+            if (value.consonant === undefined) {
+              return [value.vowel];
+            } else {
+              return [value.consonant, value.vowel];
+            }
+          })
+          .flat()
+          .join(" ");
+        window.electron.logInfo(`  phonemes: ${phonemes}`);
+
+        // クエリを編集
+        let noteIndex = 0;
+        for (let i = 0; i < query.accentPhrases.length; i++) {
+          const accentPhrase = query.accentPhrases[i];
+          const moras = accentPhrase.moras;
+          for (let j = 0; j < moras.length; j++) {
+            const mora = moras[j];
+            const note = score.notes[noteIndex];
+
+            const noteOnTime = ticksToSeconds(
+              score.resolution,
+              score.tempos,
+              note.position
+            );
+            const noteOffTime = ticksToSeconds(
+              score.resolution,
+              score.tempos,
+              note.position + note.duration
+            );
+
+            // 長さを編集
+            let vowelLength = noteOffTime - noteOnTime;
+            if (j !== moras.length - 1) {
+              const nextMora = moras[j + 1];
+              if (nextMora.consonantLength !== undefined) {
+                vowelLength -= nextMora.consonantLength;
+              }
+            } else if (i !== query.accentPhrases.length - 1) {
+              const nextAccentPhrase = query.accentPhrases[i + 1];
+              const nextMora = nextAccentPhrase.moras[0];
+              if (nextMora.consonantLength !== undefined) {
+                vowelLength -= nextMora.consonantLength;
+              }
+            }
+            mora.vowelLength = Math.max(0.001, vowelLength);
+
+            // 音高を編集
+            const freq = midiToFrequency(note.midi);
+            mora.pitch = Math.log(freq);
+
+            noteIndex++;
+          }
+        }
+
+        return query;
+      };
+
+      const calculateStartTime = (score: Score, query: AudioQuery) => {
+        const firstMora = query.accentPhrases[0].moras[0];
+        let startTime = ticksToSeconds(
+          score.resolution,
+          score.tempos,
+          score.notes[0].position
+        );
+        startTime -= query.prePhonemeLength;
+        startTime -= firstMora.consonantLength ?? 0;
+        return startTime;
+      };
+
+      const synthesize = async (singer: Singer, query: AudioQuery) => {
+        if (!getters.IS_ENGINE_READY(singer.engineId)) {
+          throw new Error("Engine not ready.");
+        }
+
+        const blob = await dispatch("INSTANTIATE_ENGINE_CONNECTOR", {
+          engineId: singer.engineId,
+        }).then((instance) => {
+          return instance.invoke("synthesisSynthesisPost")({
+            audioQuery: query,
+            speaker: singer.styleId,
+            enableInterrogativeUpspeak:
+              state.experimentalSetting.enableInterrogativeUpspeak,
+          });
+        });
+        return blob;
+      };
+
+      const getSinger = (): Singer | undefined => {
+        if (state.engineId === undefined || state.styleId === undefined) {
+          return undefined;
+        }
+        return { engineId: state.engineId, styleId: state.styleId };
+      };
+
+      // NOTE: 型推論でawaitの前か後かが考慮されないので、関数を介して取得する（型がbooleanになるようにする）
+      const startRenderingRequested = () => state.startRenderingRequested;
+      const stopRenderingRequested = () => state.stopRenderingRequested;
+
+      const render = async () => {
+        if (!state.score || !singChannel || !audioRenderer) {
+          throw new Error(
+            "score or singChannel or audioRenderer is undefined."
+          );
+        }
+        const singChannelRef = singChannel;
+        const audioRendererRef = audioRenderer;
+
+        // レンダリング中に変更される可能性のあるデータをコピーする
+        const score = copyScore(state.score);
+        const singer = getSinger();
+
+        preProcessing(score);
+
+        // Score -> Phrases
+
+        window.electron.logInfo("Updating phrases...");
+
+        const foundPhrases = await searchPhrases(singer, score);
+        for (const [hash, phrase] of foundPhrases) {
+          if (!allPhrases.has(hash)) {
+            allPhrases.set(hash, phrase);
+            singChannelRef.addPhrase(phrase);
+          }
+        }
+        for (const [hash, phrase] of allPhrases) {
+          if (!foundPhrases.has(hash)) {
+            allPhrases.delete(hash);
+            singChannelRef.removePhrase(phrase);
+          }
+        }
+
+        window.electron.logInfo("Phrases updated.");
+
+        if (startRenderingRequested() || stopRenderingRequested()) {
+          return;
+        }
+
+        for (const phrase of allPhrases.values()) {
+          if (!phrase.singer) {
+            continue;
+          }
+
+          // Phrase -> AudioQuery
+
+          if (!phrase.query) {
+            window.electron.logInfo(`Generating query...`);
+
+            phrase.query = await generateAndEditQuery(
+              phrase.singer,
+              phrase.score
+            );
+
+            window.electron.logInfo(`Query generated.`);
+          }
+
+          if (startRenderingRequested() || stopRenderingRequested()) {
+            return;
+          }
+
+          // AudioQuery -> AudioBuffer
+          // Phrase & AudioQuery -> startTime
+
+          const queryHash = await generateAudioQueryHash(phrase.query);
+          // クエリが変更されていたら再合成
+          if (queryHash !== phrase.queryHash) {
+            phrase.buffer = audioBufferCache.get(queryHash);
+            if (phrase.buffer) {
+              window.electron.logInfo(`Loaded audio buffer from cache.`);
+            } else {
+              window.electron.logInfo(`Synthesizing...`);
+
+              const blob = await synthesize(phrase.singer, phrase.query);
+              phrase.buffer = await audioRendererRef.createAudioBuffer(blob);
+              audioBufferCache.set(queryHash, phrase.buffer);
+
+              window.electron.logInfo(`Synthesized.`);
+            }
+            phrase.queryHash = queryHash;
+            phrase.startTime = calculateStartTime(phrase.score, phrase.query);
+
+            // NoteSequenceが削除される
+            singChannelRef.removePhrase(phrase);
+            // AudioBufferとstartTimeを元にAudioSequenceが作成され、追加される
+            // TODO: 分かりにくいのでリファクタリングする
+            singChannelRef.addPhrase(phrase);
+          }
+
+          if (startRenderingRequested() || stopRenderingRequested()) {
+            return;
+          }
+        }
+      };
+
+      commit("SET_START_RENDERING_REQUESTED", {
+        startRenderingRequested: true,
+      });
+      if (!state.renderingEnabled || state.nowRendering) {
+        return;
+      }
+
+      commit("SET_NOW_RENDERING", { nowRendering: true });
+      try {
+        while (startRenderingRequested()) {
+          commit("SET_START_RENDERING_REQUESTED", {
+            startRenderingRequested: false,
+          });
+          await render();
+          if (stopRenderingRequested()) {
+            break;
+          }
+        }
+      } catch (e) {
+        window.electron.logError(e);
+        throw e;
+      } finally {
+        commit("SET_STOP_RENDERING_REQUESTED", {
+          stopRenderingRequested: false,
+        });
+        commit("SET_NOW_RENDERING", { nowRendering: false });
+      }
+    },
+  },
+
+  /**
+   * レンダリング停止をリクエストし、停止するまで待機する。
+   */
+  STOP_RENDERING: {
+    action: createUILockAction(async ({ state, commit }) => {
+      if (state.nowRendering) {
+        window.electron.logInfo("Waiting for rendering to stop...");
+        commit("SET_STOP_RENDERING_REQUESTED", {
+          stopRenderingRequested: true,
+        });
+        await createPromiseThatResolvesWhen(() => !state.nowRendering);
+        window.electron.logInfo("Rendering stopped.");
+      }
+    }),
+  },
+
+  SET_RENDERING_ENABLED: {
+    mutation(state, { renderingEnabled }) {
+      state.renderingEnabled = renderingEnabled;
+    },
+    async action({ commit, dispatch }, { renderingEnabled }) {
+      if (renderingEnabled) {
+        dispatch("RENDER");
+      } else {
+        await dispatch("STOP_RENDERING");
+      }
+      commit("SET_RENDERING_ENABLED", { renderingEnabled });
+    },
+  },
+
   IMPORT_MIDI_FILE: {
     action: createUILockAction(
       async ({ dispatch }, { filePath }: { filePath?: string }) => {
@@ -1200,10 +1651,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         // TODO: ファイル名を設定できるようにする
         const fileName = "test_export.wav";
 
-        const score = getFromOptional(state.score);
         const leftLocatorPos = state.leftLocatorPosition;
         const rightLocatorPos = state.rightLocatorPosition;
-
         const renderStartTime = getters.POSITION_TO_TIME(leftLocatorPos);
         const renderEndTime = getters.POSITION_TO_TIME(rightLocatorPos);
         const renderDuration = renderEndTime - renderStartTime;
@@ -1216,6 +1665,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         if (state.nowPlaying) {
           await dispatch("SING_STOP_AUDIO");
         }
+        if (state.nowRendering) {
+          await dispatch("STOP_RENDERING");
+        }
 
         if (state.savingSetting.fixedExportEnabled) {
           filePath = path.join(state.savingSetting.fixedExportDir, fileName);
@@ -1249,8 +1701,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             // コンテキストにはノードや発音が登録されているので問題なくレンダリングされます
             // TODO: 分かりにくいので後でリファクタリングしたい
             const channel = new SingChannel(context);
-            const noteEvents = generateNoteEvents(score, score.notes);
-            channel.setNoteEvents(noteEvents);
+            allPhrases.forEach((value) => channel.addPhrase(value));
           }
         );
         const waveFileData = convertToWavFileData(audioBuffer);
diff --git a/src/store/type.ts b/src/store/type.ts
index 3193f38031..f6cf130dfe 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -77,11 +77,6 @@ export type Score = {
   notes: Note[];
 };
 
-export type RenderPhrase = {
-  renderNotes: Note[];
-  query?: AudioQuery;
-};
-
 export type Command = {
   unixMillisec: number;
   undoPatches: Patch[];
@@ -697,7 +692,6 @@ export type SingingStoreState = {
   engineId?: string;
   styleId?: number;
   score?: Score;
-  renderPhrases: RenderPhrase[];
   // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
   isShowSinger: boolean;
   // NOTE: オーディオ再生はボイスと同様もしくは拡張して使う？
@@ -710,6 +704,10 @@ export type SingingStoreState = {
   volume: number;
   leftLocatorPosition: number;
   rightLocatorPosition: number;
+  renderingEnabled: boolean;
+  startRenderingRequested: boolean;
+  stopRenderingRequested: boolean;
+  nowRendering: boolean;
 };
 
 export type SingingStoreTypes = {
@@ -841,6 +839,31 @@ export type SingingStoreTypes = {
     mutation: { volume: number };
     action(payload: { volume: number }): void;
   };
+
+  SET_START_RENDERING_REQUESTED: {
+    mutation: { startRenderingRequested: boolean };
+  };
+
+  SET_STOP_RENDERING_REQUESTED: {
+    mutation: { stopRenderingRequested: boolean };
+  };
+
+  SET_NOW_RENDERING: {
+    mutation: { nowRendering: boolean };
+  };
+
+  RENDER: {
+    action(): void;
+  };
+
+  STOP_RENDERING: {
+    action(): void;
+  };
+
+  SET_RENDERING_ENABLED: {
+    mutation: { renderingEnabled: boolean };
+    action(payload: { renderingEnabled: boolean }): void;
+  };
 };
 
 /*
@@ -1271,6 +1294,10 @@ export type UiStoreTypes = {
   CHECK_EDITED_AND_NOT_SAVE: {
     action(): Promise<void>;
   };
+
+  PROCESS_BEFORE_QUITTING: {
+    action(): Promise<void>;
+  };
 };
 
 /*
diff --git a/src/store/ui.ts b/src/store/ui.ts
index 432230d9c6..651b2a39a1 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -530,6 +530,14 @@ export const uiStore = createPartialStore<UiStoreTypes>({
           return;
         }
       }
+    },
+  },
+
+  PROCESS_BEFORE_QUITTING: {
+    async action({ dispatch }) {
+      await dispatch("SING_STOP_AUDIO");
+      await dispatch("CHECK_EDITED_AND_NOT_SAVE");
+      await dispatch("STOP_RENDERING");
 
       window.electron.closeWindow();
     },
diff --git a/src/type/ipc.ts b/src/type/ipc.ts
index b4500cbd42..ae2fa36d39 100644
--- a/src/type/ipc.ts
+++ b/src/type/ipc.ts
@@ -292,7 +292,7 @@ export type IpcSOData = {
     return: void;
   };
 
-  CHECK_EDITED_AND_NOT_SAVE: {
+  PROCESS_BEFORE_QUITTING: {
     args: [];
     return: void;
   };
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index da0391b177..bf93886acd 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -62,6 +62,7 @@ export default defineComponent({
       await store.dispatch("SET_RIGHT_LOCATOR_POSITION", {
         position: 480 * 4 * 16,
       });
+      await store.dispatch("SET_RENDERING_ENABLED", { renderingEnabled: true });
       return {};
     });
   },
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 0a6dc87004..7beac9f8b5 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -32,7 +32,6 @@ describe("store/vuex.js test", () => {
         uiLockCount: 0,
         dialogLockCount: 0,
         nowPlayingContinuously: false,
-        renderPhrases: [],
         undoCommands: [],
         redoCommands: [],
         useGpu: false,
@@ -128,6 +127,10 @@ describe("store/vuex.js test", () => {
         volume: 0,
         leftLocatorPosition: 0,
         rightLocatorPosition: 0,
+        renderingEnabled: false,
+        startRenderingRequested: false,
+        stopRenderingRequested: false,
+        nowRendering: false,
       },
       getters: {
         ...uiStore.getters,
@@ -189,8 +192,6 @@ describe("store/vuex.js test", () => {
     assert.equal(store.state.audioPlayStartPoint, 0);
     assert.equal(store.state.uiLockCount, 0);
     assert.equal(store.state.nowPlayingContinuously, false);
-    assert.isArray(store.state.renderPhrases);
-    assert.isEmpty(store.state.renderPhrases);
     assert.isArray(store.state.undoCommands);
     assert.isEmpty(store.state.undoCommands);
     assert.isArray(store.state.redoCommands);

From 554afef14d84317b6f7f373bf3ba1c7b7ca67715 Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Tue, 11 Jul 2023 05:47:39 +0900
Subject: [PATCH 12/59] =?UTF-8?q?[project-s]=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?(=E8=A4=87=E6=95=B0)=E3=82=92=E3=83=89=E3=83=A9=E3=83=83?=
 =?UTF-8?q?=E3=82=B0=E3=81=8A=E3=82=88=E3=81=B3=E3=82=AD=E3=83=BC=E3=83=9C?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=A7=E7=A7=BB=E5=8B=95+=E9=95=B7?=
 =?UTF-8?q?=E3=81=95=E5=A4=89=E6=9B=B4+=E5=89=8A=E9=99=A4=20(#1256)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sig <sigprogrammer@gmail.com>
Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
Co-authored-by: Romot <romot@romotmbp16.local>
---
 src/components/Sing/ScoreSequencer.vue | 649 +++++++++++++++++--------
 src/components/Sing/SequencerKeys.vue  | 102 ++++
 src/components/Sing/SequencerNote.vue  | 220 +++++++++
 src/helpers/singHelper.ts              |   3 +
 src/store/singing.ts                   | 123 ++++-
 src/store/type.ts                      |  37 +-
 tests/unit/store/Vuex.spec.ts          |   1 +
 7 files changed, 897 insertions(+), 238 deletions(-)
 create mode 100644 src/components/Sing/SequencerKeys.vue

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index f8d06d83eb..07eb3a884e 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -1,74 +1,48 @@
 <template>
-  <div class="score-sequencer" id="score-sequencer">
-    <!-- 鍵盤表示 -->
-    <svg
-      width="48"
-      v-bind:height="`${BASE_Y_SIZE * zoomY * 128}`"
-      xmlns="http://www.w3.org/2000/svg"
-      class="sequencer-keys"
-    >
-      <g v-for="(y, index) in gridY" :key="index">
-        <rect
-          x="0"
-          v-bind:y="`${BASE_Y_SIZE * zoomY * index}`"
-          v-bind:width="`${y.color === 'black' ? 30 : 48}`"
-          v-bind:height="`${BASE_Y_SIZE * zoomY}`"
-          v-bind:class="`sequencer-keys-item-${y.color}`"
-          v-bind:title="y.name"
-        />
-        <line
-          x1="0"
-          v-bind:y1="`${(index + 1) * BASE_Y_SIZE * zoomY}`"
-          x2="48"
-          v-bind:y2="`${(index + 1) * BASE_Y_SIZE * zoomY}`"
-          stroke-width="1"
-          v-bind:class="`sequencer-keys-item-separator ${
-            y.pitch === 'C' && 'sequencer-keys-item-separator-octave'
-          } ${y.pitch === 'F' && 'sequencer-keys-item-separator-f'}`"
-          v-if="y.pitch === 'C' || y.pitch === 'F'"
-        />
-        <text
-          font-size="10"
-          x="32"
-          v-bind:y="`${BASE_Y_SIZE * zoomY * (index + 1) - 4}`"
-          v-if="y.pitch === 'C'"
-          class="sequencer-keys-item-pitchname"
-        >
-          {{ y.name }}
-        </text>
-      </g>
-    </svg>
+  <div
+    class="score-sequencer"
+    id="score-sequencer"
+    @mousedown="handleMouseDown"
+    @mousemove="handleMouseMove"
+    @mouseup="handleMouseUp"
+    @dblclick="addNote"
+    @dblclick.prevent.stop="removeNote"
+  >
+    <!-- 鍵盤 -->
+    <sequencer-keys />
+    <!-- シーケンサ -->
     <div class="sequencer-body">
       <!-- グリッド -->
       <!-- NOTE: 現状小節+オクターブごとの罫線なし -->
       <svg
-        v-bind:height="`${BASE_Y_SIZE * zoomY * 128}`"
-        v-bind:width="`${gridX.length * BASE_X_SIZE * zoomX}`"
+        :height="`${sizeY * zoomY * 128}`"
+        :width="`${gridX.length * sizeX * zoomX}`"
         xmlns="http://www.w3.org/2000/svg"
         class="sequencer-grids"
       >
+        <!-- パターングリッド -->
         <defs>
           <pattern
             id="sequencer-grid-16"
-            v-bind:width="`${BASE_X_SIZE * zoomX}px`"
-            v-bind:height="`${12 * BASE_Y_SIZE * zoomY}px`"
+            :width="`${sizeX * zoomX}px`"
+            :height="`${12 * sizeY * zoomY}px`"
             patternUnits="userSpaceOnUse"
           >
             <rect
               v-for="(y, index) in gridY"
               :key="index"
               x="0"
-              v-bind:y="`${BASE_Y_SIZE * zoomY * index}`"
-              v-bind:width="`${BASE_X_SIZE * zoomX}`"
-              v-bind:height="`${BASE_Y_SIZE * zoomY}`"
-              v-bind:class="`sequencer-grids-col sequencer-grids-col-${y.color}`"
+              :y="`${sizeY * zoomY * index}`"
+              :width="`${sizeX * zoomX}`"
+              :height="`${sizeY * zoomY}`"
+              :class="`sequencer-grids-col sequencer-grids-col-${y.color}`"
             />
           </pattern>
           <!-- NOTE: 4/4 1小節でグリッド見た目確認目的 -->
           <pattern
             id="sequencer-grid-measure"
-            v-bind:width="`${BASE_X_SIZE * 16 * zoomX}`"
-            v-bind:height="`${12 * BASE_Y_SIZE * zoomY}`"
+            :width="`${sizeX * 16 * zoomX}`"
+            :height="`${12 * sizeY * zoomY}`"
             patternUnits="userSpaceOnUse"
           >
             <rect width="100%" height="100%" fill="url(#sequencer-grid-16)" />
@@ -90,63 +64,20 @@
           height="100%"
           id="sequencer-grid"
           fill="url(#sequencer-grid-measure)"
-          @mousedown="(e) => addNote(e)"
         />
       </svg>
-      <!-- NOTE: ノートと歌詞入力あわせコンポーネント分割予定 -->
-      <div
+      <sequencer-note
         v-for="(note, index) in notes"
         :key="index"
-        class="sequencer-note"
-        v-bind:style="{
-          transform: `translate3d(${(note.position / 4) * zoomX}px,${
-            (127 - note.midi) * BASE_Y_SIZE * zoomY
-          }px,0)`,
-        }"
-      >
-        <!-- NOTE: q-inputへの変更 / 表示面+速度面から、クリック時のみinputを表示に変更予定 -->
-        <input
-          type="text"
-          :value="note.lyric"
-          @input="(e) => setLyric(index, e)"
-          class="sequencer-note-lyric"
-        />
-        <svg
-          v-bind:height="`${BASE_Y_SIZE * zoomY}`"
-          v-bind:width="`${(note.duration / 4) * zoomX}`"
-          xmlns="http://www.w3.org/2000/svg"
-          class="sequencer-note-bar"
-        >
-          <g @dblclick="removeNote(index)">
-            <rect
-              y="0"
-              x="0"
-              height="100%"
-              width="100%"
-              stroke-width="1"
-              class="sequencer-note-bar-body"
-            />
-            <rect
-              y="0"
-              x="-4"
-              height="100%"
-              width="8"
-              fill-opacity="0"
-              draggable
-              class="sequencer-note-bar-draghandle"
-            />
-            <rect
-              y="0"
-              v-bind:x="`${(note.duration / 4) * zoomX - 4}`"
-              height="100%"
-              width="8"
-              fill-opacity="0"
-              class="sequencer-note-bar-draghandle"
-              draggable
-            />
-          </g>
-        </svg>
-      </div>
+        :note="note"
+        :index="index"
+        :cursorX="cursorX"
+        :cursorY="cursorY"
+        @handleNotesKeydown="handleNotesKeydown"
+        @handleDragMoveStart="handleDragMoveStart"
+        @handleDragRightStart="handleDragRightStart"
+        @handleDragLeftStart="handleDragLeftStart"
+      />
     </div>
     <!-- NOTE: スクロールバー+ズームレンジ仮 -->
     <input
@@ -155,7 +86,7 @@
       max="1"
       step="0.05"
       :value="zoomX"
-      @input="(e) => setZoomX(e)"
+      @input="setZoomX"
       v-bind:style="{
         position: 'fixed',
         zIndex: 10000,
@@ -170,7 +101,7 @@
       max="1"
       step="0.05"
       :value="zoomY"
-      @input="(e) => setZoomY(e)"
+      @input="setZoomY"
       v-bind:style="{
         position: 'fixed',
         zIndex: 10000,
@@ -184,24 +115,51 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, onMounted } from "vue";
+import { defineComponent, computed, ref, onMounted } from "vue";
 import { useStore } from "@/store";
+import { v4 as uuidv4 } from "uuid";
+import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
+import SequencerNote from "@/components/Sing/SequencerNote.vue";
 import {
   midiKeys,
   getPitchFromMidi,
   getDoremiFromMidi,
+  BASE_GRID_SIZE_X as sizeX,
+  BASE_GRID_SIZE_Y as sizeY,
 } from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingScoreSequencer",
+  components: {
+    SequencerKeys,
+    SequencerNote,
+  },
   setup() {
+    enum DragMode {
+      NONE = "NONE",
+      MOVE = "MOVE",
+      NOTE_RIGHT = "NOTE_RIGHT",
+      NOTE_LEFT = "NOTE_LEFT",
+      SELECT = "SELECT",
+    }
     const store = useStore();
+    const state = store.state;
+    // カーソルポジション
+    const cursorX = ref(0);
+    const cursorY = ref(0);
+    // ドラッグ状態
+    const dragMode = ref<DragMode>(DragMode.NONE);
+    const dragId = ref(0);
+    const dragMoveCurrentX = ref();
+    const dragMoveCurrentY = ref();
+    const dragDurationCurrentX = ref();
+    // シーケンサグリッド
     const gridY = midiKeys;
     const gridX = computed(() => {
-      const resolution = store.state.score?.resolution || 480;
+      const resolution = state.score?.resolution || 480;
       // NOTE: 最低長: 仮32小節...MIDI長さ(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
       const minDuration = resolution * 4 * 32;
-      const lastNote = store.state.score?.notes.slice(-1)[0];
+      const lastNote = state.score?.notes.slice(-1)[0];
       // Score長さ: スコア長もしくは最低長のうち長い方
       const totalDuration = lastNote
         ? Math.max(lastNote.position + lastNote.duration, minDuration)
@@ -214,36 +172,42 @@ export default defineComponent({
         (gridNum) => gridNum * gridDuration
       );
     });
-    const notes = computed(() => store.state.score?.notes);
-    const timeSignatures = computed(() => store.state.score?.timeSignatures);
-    const zoomX = computed(() => store.state.sequencerZoomX);
-    const zoomY = computed(() => store.state.sequencerZoomY);
-    const scrollX = computed(() => store.state.sequencerScrollX);
-    const scrollY = computed(() => store.state.sequencerScrollY);
-    const BASE_Y_SIZE = 30;
-    const BASE_X_SIZE = 30;
-    onMounted(() => {
-      const el = document.querySelector("#score-sequencer");
-      // C4あたりにスクロールする
-      if (el) {
-        el.scrollTop = scrollY.value * (BASE_Y_SIZE * zoomY.value);
-      }
-    });
+    // ノート
+    const notes = computed(() => state.score?.notes);
+    // 表紙
+    const timeSignatures = computed(() => state.score?.timeSignatures);
+    // ズーム状態
+    const zoomX = computed(() => state.sequencerZoomX);
+    const zoomY = computed(() => state.sequencerZoomY);
+    // スナップサイズ
+    const snapSize = computed(() => state.sequencerSnapSize);
+    const snapWidth = computed(() => (snapSize.value / 4) * zoomX.value);
+    // グリッドサイズ
+    const gridWidth = computed(() => sizeX * zoomX.value);
+    const gridHeight = computed(() => sizeY * zoomY.value);
+    // スクロール位置
+    // const scrollX = computed(() => state.sequencerScrollX);
+    const scrollY = computed(() => state.sequencerScrollY);
+    const selectedNoteIds = computed(() => state.selectedNoteIds);
+
+    // ノートの追加
     const addNote = (event: MouseEvent) => {
-      const resolution = store.state.score?.resolution;
-      const gridXSize = resolution ? resolution / 4 : 120;
+      const resolution = state.score?.resolution;
+      const gridXSize = resolution ? resolution / 4 : snapSize.value;
       const position =
-        gridXSize * Math.floor(event.offsetX / (BASE_X_SIZE * zoomX.value));
-      const midi =
-        127 - Math.floor(event.offsetY / (BASE_Y_SIZE * zoomY.value));
+        gridXSize * Math.floor(event.offsetX / (sizeX * zoomX.value));
+      const midi = 127 - Math.floor(event.offsetY / (sizeY * zoomY.value));
       if (0 > midi) {
         return;
       }
       // NOTE: ノートの追加は1/8をベース
       const duration = gridXSize * 2;
       const lyric = getDoremiFromMidi(midi);
+      // NOTE: 仮ID
+      const id = uuidv4();
       store.dispatch("ADD_NOTE", {
         note: {
+          id,
           position,
           midi,
           duration,
@@ -251,26 +215,217 @@ export default defineComponent({
         },
       });
     };
-    const removeNote = (index: number) => {
-      store.dispatch("REMOVE_NOTE", { index });
+
+    // マウスダウン
+    // 選択中のノートがある場合は選択リセット
+    const handleMouseDown = () => {
+      if (0 < selectedNoteIds.value.length) {
+        store.dispatch("CLEAR_SELECTED_NOTE_IDS");
+      }
     };
-    // NOTE: ノートのバーと歌詞入力でコンポーネント分割予定
-    const setLyric = (index: number, event: Event) => {
-      if (!(event.target instanceof HTMLInputElement)) {
+
+    // マウス移動
+    // ドラッグ中の場合はカーソル位置を保持
+    const handleMouseMove = (event: MouseEvent) => {
+      if (dragMode.value !== DragMode.NONE) {
+        cursorX.value = event.clientX;
+        cursorY.value = event.clientY;
+      }
+    };
+
+    // マウスアップ
+    // ドラッグしていた場合はドラッグを終了
+    const handleMouseUp = () => {
+      if (dragMode.value !== DragMode.NONE) {
+        cancelAnimationFrame(dragId.value);
+        dragMode.value = DragMode.NONE;
+        return;
+      }
+    };
+
+    // ドラッグでのノートの移動
+    const dragMove = () => {
+      if (!state.score) {
+        throw new Error("Score is undefined.");
+      }
+      if (dragMode.value !== DragMode.MOVE) {
+        cancelAnimationFrame(dragId.value);
+        return;
+      }
+      // X方向, Y方向の移動距離
+      const distanceX = cursorX.value - dragMoveCurrentX.value;
+      const distanceY = cursorY.value - dragMoveCurrentY.value;
+
+      // カーソル位置に応じてノート移動量を計算
+      let amountPositionX = 0;
+      if (gridWidth.value <= Math.abs(distanceX)) {
+        amountPositionX = 0 < distanceX ? snapSize.value : -snapSize.value;
+        const dragMoveCurrentXNext =
+          dragMoveCurrentX.value +
+          (0 < amountPositionX ? gridWidth.value : -gridWidth.value);
+        dragMoveCurrentX.value = dragMoveCurrentXNext;
+      }
+      let amountPositionY = 0;
+      if (gridHeight.value <= Math.abs(distanceY)) {
+        amountPositionY = 0 < distanceY ? -1 : 1;
+        const dragMoveCurrentYNext =
+          dragMoveCurrentY.value +
+          (0 > amountPositionY ? gridHeight.value : -gridHeight.value);
+        dragMoveCurrentY.value = dragMoveCurrentYNext;
+      }
+
+      // 選択中のノートのpositionとmidiを変更
+      let isNotesChanged = false;
+      const newNotes = [...state.score.notes].map((note) => {
+        if (selectedNoteIds.value.includes(note.id)) {
+          if (amountPositionX === 0 && amountPositionY === 0) {
+            return note;
+          }
+          isNotesChanged = true;
+          const position = note.position + amountPositionX;
+          const midi = note.midi + amountPositionY;
+          return {
+            ...note,
+            midi,
+            position,
+          };
+        } else {
+          return note;
+        }
+      });
+
+      // 左端より前はドラッグしない
+      if (newNotes.some((note) => note.position < 0)) {
+        dragId.value = requestAnimationFrame(dragMove);
         return;
       }
-      if (event.target.value && store.state.score) {
-        const currentNote = store.state.score?.notes[index];
-        const lyric = event.target.value;
-        store.dispatch("CHANGE_NOTE", {
-          index,
-          note: {
-            ...currentNote,
-            lyric,
-          },
+      if (isNotesChanged) {
+        store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+      }
+      dragId.value = requestAnimationFrame(dragMove);
+    };
+
+    // ノートドラッグ開始
+    const handleDragMoveStart = (event: MouseEvent) => {
+      if (selectedNoteIds.value.length > 0) {
+        dragMode.value = DragMode.MOVE;
+        setTimeout(() => {
+          dragMoveCurrentX.value = event.clientX;
+          dragMoveCurrentY.value = event.clientY;
+          dragId.value = requestAnimationFrame(dragMove);
+        }, 360);
+      }
+    };
+
+    // ノート右ドラッグ
+    // FIXME: 左右ドラッグロジックを統一する
+    const dragRight = () => {
+      if (!state.score) {
+        throw new Error("Score is undefined.");
+      }
+      if (dragMode.value !== DragMode.NOTE_RIGHT) {
+        cancelAnimationFrame(dragId.value);
+        return;
+      }
+      const distanceX = cursorX.value - dragDurationCurrentX.value;
+      if (snapWidth.value <= Math.abs(distanceX)) {
+        let isNotesChanged = false;
+        const newNotes = [...state.score.notes].map((note) => {
+          if (selectedNoteIds.value.includes(note.id)) {
+            const duration =
+              note.duration +
+              (0 < distanceX ? snapSize.value : -snapSize.value);
+            if (duration < Math.max(snapSize.value, 0) || note.position < 0) {
+              return note;
+            } else {
+              isNotesChanged = true;
+              return {
+                ...note,
+                duration,
+              };
+            }
+          } else {
+            return note;
+          }
+        });
+        const dragDurationCurrentXNext =
+          dragDurationCurrentX.value +
+          (0 < distanceX ? snapWidth.value : -snapWidth.value);
+        dragDurationCurrentX.value = dragDurationCurrentXNext;
+        dragId.value = requestAnimationFrame(dragRight);
+        if (isNotesChanged) {
+          store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+        }
+      }
+      dragId.value = requestAnimationFrame(dragRight);
+    };
+
+    // ノート右ドラッグ開始
+    const handleDragRightStart = (event: MouseEvent) => {
+      dragMode.value = DragMode.NOTE_RIGHT;
+      setTimeout(() => {
+        dragDurationCurrentX.value = event.clientX;
+        dragId.value = requestAnimationFrame(dragRight);
+      }, 360);
+    };
+
+    // ノート左ドラッグ
+    // FIXME: 左右ドラッグロジックを統一する
+    const dragLeft = () => {
+      if (!state.score) {
+        throw new Error("Score is undefined.");
+      }
+      if (dragMode.value !== DragMode.NOTE_LEFT) {
+        cancelAnimationFrame(dragId.value);
+        return;
+      }
+      const distanceX = cursorX.value - dragDurationCurrentX.value;
+      if (snapWidth.value <= Math.abs(distanceX)) {
+        let isNotesChanged = false;
+        const newNotes = [...state.score.notes].map((note) => {
+          if (selectedNoteIds.value.includes(note.id)) {
+            const position =
+              note.position +
+              (0 < distanceX ? snapSize.value : -snapSize.value);
+            const duration =
+              note.duration +
+              (0 > distanceX ? snapSize.value : -snapSize.value);
+            if (duration < Math.max(snapSize.value, 0) || note.position < 0) {
+              return note;
+            } else {
+              isNotesChanged = true;
+              return {
+                ...note,
+                position,
+                duration,
+              };
+            }
+          } else {
+            return note;
+          }
         });
+        const dragDurationCurrentXNext =
+          dragDurationCurrentX.value +
+          (0 < distanceX ? snapWidth.value : -snapWidth.value);
+        dragDurationCurrentX.value = dragDurationCurrentXNext;
+        dragId.value = requestAnimationFrame(dragLeft);
+        if (isNotesChanged) {
+          store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+        }
       }
+      dragId.value = requestAnimationFrame(dragLeft);
+    };
+
+    // ノート左ドラッグ開始
+    const handleDragLeftStart = (event: MouseEvent) => {
+      dragMode.value = DragMode.NOTE_LEFT;
+      setTimeout(() => {
+        dragDurationCurrentX.value = event.clientX;
+        dragId.value = requestAnimationFrame(dragLeft);
+      }, 360);
     };
+
+    // X軸ズーム
     const setZoomX = (event: Event) => {
       if (!(event.target instanceof HTMLInputElement)) {
         return;
@@ -279,6 +434,8 @@ export default defineComponent({
         zoomX: Number(event.target.value),
       });
     };
+
+    // Y軸ズーム
     const setZoomY = (event: Event) => {
       if (!(event.target instanceof HTMLInputElement)) {
         return;
@@ -287,6 +444,126 @@ export default defineComponent({
         zoomY: Number(event.target.value),
       });
     };
+
+    // キーボードイベント
+    const handleNotesArrowUp = () => {
+      if (!state.score) {
+        throw new Error("Score is undefined.");
+      }
+      const newNotes = state.score.notes.map((note) => {
+        if (selectedNoteIds.value.includes(note.id)) {
+          const midi = Math.min(note.midi + 1, 127);
+          return {
+            ...note,
+            midi,
+          };
+        } else {
+          return note;
+        }
+      });
+      if (newNotes.some((note) => note.midi > 127)) {
+        return;
+      }
+      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+    };
+
+    const handleNotesArrowDown = () => {
+      if (!state.score) {
+        throw new Error("Score is undefined.");
+      }
+      const newNotes = state.score.notes.map((note) => {
+        if (selectedNoteIds.value.includes(note.id)) {
+          const midi = Math.max(note.midi - 1, 0);
+          return {
+            ...note,
+            midi,
+          };
+        } else {
+          return note;
+        }
+      });
+      if (newNotes.some((note) => note.midi < 0)) {
+        return;
+      }
+      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+    };
+
+    const handleNotesArrowRight = () => {
+      if (!state.score) {
+        throw new Error("Score is undefined.");
+      }
+      const newNotes = state.score.notes.map((note) => {
+        if (selectedNoteIds.value.includes(note.id)) {
+          const position = note.position + snapSize.value;
+          return {
+            ...note,
+            position,
+          };
+        } else {
+          return note;
+        }
+      });
+      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+    };
+
+    const handleNotesArrowLeft = () => {
+      if (!state.score) {
+        throw new Error("Score is undefined.");
+      }
+      const newNotes = state.score.notes.map((note) => {
+        if (selectedNoteIds.value.includes(note.id)) {
+          const position = note.position - snapSize.value;
+          return {
+            ...note,
+            position,
+          };
+        } else {
+          return note;
+        }
+      });
+      if (newNotes.some((note) => note.position < 0)) {
+        return;
+      }
+      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+    };
+
+    const handleNotesBackspaceOrDelete = () => {
+      store.dispatch("REMOVE_SELECTED_NOTES");
+    };
+
+    const handleNotesKeydown = (event: KeyboardEvent) => {
+      switch (event.key) {
+        case "ArrowUp":
+          handleNotesArrowUp();
+          break;
+        case "ArrowDown":
+          handleNotesArrowDown();
+          break;
+        case "ArrowRight":
+          handleNotesArrowRight();
+          break;
+        case "ArrowLeft":
+          handleNotesArrowLeft();
+          break;
+        case "Backspace":
+          handleNotesBackspaceOrDelete();
+          break;
+        case "Delete":
+          handleNotesBackspaceOrDelete();
+          break;
+        default:
+          break;
+      }
+    };
+
+    onMounted(() => {
+      const el = document.querySelector("#score-sequencer");
+      // C4あたりにスクロールする
+      if (el) {
+        el.scrollTop = scrollY.value * (sizeY * zoomY.value);
+      }
+    });
+
     return {
       timeSignatures,
       gridY,
@@ -294,14 +571,21 @@ export default defineComponent({
       notes,
       zoomX,
       zoomY,
+      sizeX,
+      sizeY,
+      cursorX,
+      cursorY,
       getPitchFromMidi,
-      addNote,
-      removeNote,
-      setLyric,
       setZoomX,
       setZoomY,
-      BASE_X_SIZE,
-      BASE_Y_SIZE,
+      addNote,
+      handleMouseDown,
+      handleMouseMove,
+      handleMouseUp,
+      handleNotesKeydown,
+      handleDragMoveStart,
+      handleDragRightStart,
+      handleDragLeftStart,
     };
   },
 });
@@ -319,35 +603,10 @@ export default defineComponent({
   padding-bottom: 164px;
   position: relative;
   width: 100%;
-}
-
-.sequencer-keys {
-  backface-visibility: hidden;
-  background: #fff;
-  display: block;
-  position: sticky;
-  left: 0;
-  z-index: 100;
-}
-
-.sequencer-keys-item-separator-octave {
-  stroke: #bbb;
-}
 
-.sequencer-keys-item-separator-f {
-  stroke: #ddd;
-}
-
-.sequencer-keys-item-white {
-  fill: #fff;
-}
-
-.sequencer-keys-item-black {
-  fill: #555;
-}
-
-.sequencer-keys-item-pitchname {
-  fill: #555;
+  &.move {
+    cursor: move;
+  }
 }
 
 .sequencer-body {
@@ -383,46 +642,4 @@ export default defineComponent({
   backface-visibility: hidden;
   stroke: #b0b0b0;
 }
-
-.sequencer-note {
-  backface-visibility: hidden;
-  position: absolute;
-  top: 0;
-  left: 0;
-  transform-origin: 0, 0;
-}
-
-.sequencer-note-lyric {
-  background: white;
-  border: 0;
-  border-bottom: 1px solid colors.$primary-light;
-  color: colors.$display;
-  font-size: 12px;
-  font-weight: bold;
-  font-feature-settings: "palt" 1;
-  letter-spacing: 0.05em;
-  outline: none;
-  padding: 0;
-  position: absolute;
-  bottom: calc(100% - 1px);
-  left: 0;
-  width: 24px;
-}
-
-.sequencer-note-bar {
-  display: block;
-  position: relative;
-}
-.sequencer-note-bar-body {
-  fill: colors.$primary;
-  stroke: #fff;
-  stroke-opacity: 0.5;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.sequencer-note-bar-draghandle {
-  cursor: ew-resize;
-}
 </style>
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
new file mode 100644
index 0000000000..7e973dfdca
--- /dev/null
+++ b/src/components/Sing/SequencerKeys.vue
@@ -0,0 +1,102 @@
+<template>
+  <svg
+    width="48"
+    :height="`${sizeY * zoomY * 128}`"
+    xmlns="http://www.w3.org/2000/svg"
+    class="sequencer-keys"
+  >
+    <g v-for="(y, index) in gridY" :key="index">
+      <rect
+        x="0"
+        :y="`${sizeY * zoomY * index}`"
+        :width="`${y.color === 'black' ? 30 : 48}`"
+        :height="`${sizeY * zoomY}`"
+        :class="`sequencer-keys-item-${y.color}`"
+        :title="y.name"
+      />
+      <line
+        x1="0"
+        x2="48"
+        :y1="`${(index + 1) * sizeY * zoomY}`"
+        :y2="`${(index + 1) * sizeY * zoomY}`"
+        :class="`sequencer-keys-item-separator ${
+          y.pitch === 'C' && 'sequencer-keys-item-separator-octave'
+        } ${y.pitch === 'F' && 'sequencer-keys-item-separator-f'}`"
+        v-if="y.pitch === 'C' || y.pitch === 'F'"
+      />
+      <text
+        font-size="10"
+        x="32"
+        :y="`${sizeY * zoomY * (index + 1) - 4}`"
+        v-if="y.pitch === 'C'"
+        class="sequencer-keys-item-pitchname"
+      >
+        {{ y.name }}
+      </text>
+    </g>
+  </svg>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from "vue";
+import { useStore } from "@/store";
+import {
+  midiKeys,
+  BASE_GRID_SIZE_X as sizeX,
+  BASE_GRID_SIZE_Y as sizeY,
+} from "@/helpers/singHelper";
+
+export default defineComponent({
+  name: "SingSequencerKeys",
+  setup() {
+    const store = useStore();
+    const gridY = midiKeys;
+    const zoomX = computed(() => store.state.sequencerZoomX);
+    const zoomY = computed(() => store.state.sequencerZoomY);
+    return {
+      gridY,
+      sizeX,
+      sizeY,
+      zoomX,
+      zoomY,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.sequencer-keys {
+  backface-visibility: hidden;
+  background: #fff;
+  display: block;
+  position: sticky;
+  left: 0;
+  z-index: 100;
+}
+
+.sequencer-keys-item-separator {
+  stroke-width: 1;
+}
+.sequencer-keys-item-separator-octave {
+  stroke: #bbb;
+}
+
+.sequencer-keys-item-separator-f {
+  stroke: #ddd;
+}
+
+.sequencer-keys-item-white {
+  fill: #fff;
+}
+
+.sequencer-keys-item-black {
+  fill: #555;
+}
+
+.sequencer-keys-item-pitchname {
+  fill: #555;
+}
+</style>
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index e69de29bb2..7ae34e8757 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -0,0 +1,220 @@
+<template>
+  <div
+    :class="`sequencer-note ${isSelected ? 'selected' : ''}`"
+    :style="{
+      transform: `translate3d(${positionX}px,${positionY}px,0)`,
+    }"
+  >
+    <!-- NOTE: q-inputへの変更 / 表示面+速度面から、クリック時のみinputを表示に変更予定 -->
+    <input
+      type="text"
+      :value="note.lyric"
+      @input="setLyric"
+      class="sequencer-note-lyric"
+    />
+    <svg
+      :height="`${barHeight}`"
+      :width="`${barWidth}`"
+      xmlns="http://www.w3.org/2000/svg"
+      class="sequencer-note-bar"
+      @dblclick.prevent="removeNote"
+      @keydown.prevent="handleKeydown"
+      focusable="true"
+      tabindex="0"
+    >
+      <g>
+        <rect
+          y="0"
+          x="0"
+          height="100%"
+          width="100%"
+          stroke-width="1"
+          class="sequencer-note-bar-body"
+          @mousedown.stop="handleMouseDown"
+        />
+        <rect
+          y="-25%"
+          x="-4"
+          height="150%"
+          width="12"
+          fill-opacity="0"
+          class="sequencer-note-bar-draghandle"
+          @mousedown.stop="handleDragLeftStart"
+        />
+        <rect
+          y="-25%"
+          :x="`${(note.duration / 4) * zoomX - 4}`"
+          width="16"
+          height="150%"
+          fill-opacity="0"
+          class="sequencer-note-bar-draghandle"
+          @mousedown.stop="handleDragRightStart"
+        />
+      </g>
+    </svg>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed, PropType } from "vue";
+import { useStore } from "@/store";
+import { Note } from "@/store/type";
+import {
+  BASE_GRID_SIZE_X as sizeX,
+  BASE_GRID_SIZE_Y as sizeY,
+} from "@/helpers/singHelper";
+
+export default defineComponent({
+  name: "SingSequencerNote",
+  props: {
+    note: { type: Object as PropType<Note>, required: true },
+    index: { type: Number, required: true },
+    cursorX: { type: Number },
+    cursorY: { type: Number },
+  },
+
+  emits: [
+    "handleNotesKeydown",
+    "handleDragMoveStart",
+    "handleDragRightStart",
+    "handleDragLeftStart",
+  ],
+
+  setup(props, { emit }) {
+    const store = useStore();
+    const zoomX = computed(() => store.state.sequencerZoomX);
+    const zoomY = computed(() => store.state.sequencerZoomY);
+    const positionX = computed(() => (props.note.position / 4) * zoomX.value);
+    const positionY = computed(
+      () => (127 - props.note.midi) * sizeY * zoomY.value
+    );
+    const barHeight = computed(() => sizeY * zoomY.value);
+    const barWidth = computed(() => (props.note.duration / 4) * zoomX.value);
+    const isSelected = computed(() => {
+      return store.state.selectedNoteIds.includes(props.note.id);
+    });
+
+    const removeNote = () => {
+      store.dispatch("REMOVE_NOTE", { id: props.note.id });
+    };
+
+    const setLyric = (event: InputEvent) => {
+      if (!(event.target instanceof HTMLInputElement)) {
+        return;
+      }
+      if (event.target.value) {
+        const lyric = event.target.value;
+        store.dispatch("UPDATE_NOTE", {
+          note: {
+            ...props.note,
+            lyric,
+          },
+        });
+      }
+    };
+
+    const handleKeydown = (event: KeyboardEvent) => {
+      emit("handleNotesKeydown", event);
+    };
+
+    const handleMouseDown = (event: MouseEvent) => {
+      if (!store.state.selectedNoteIds.includes(props.note.id)) {
+        const noteIds = [...store.state.selectedNoteIds, props.note.id];
+        store.dispatch("SET_SELECTED_NOTE_IDS", {
+          noteIds,
+        });
+      } else {
+        emit("handleDragMoveStart", event);
+      }
+    };
+
+    const handleDragRightStart = (event: MouseEvent) => {
+      const noteIds = [...store.state.selectedNoteIds, props.note.id];
+      store.dispatch("SET_SELECTED_NOTE_IDS", {
+        noteIds,
+      });
+      emit("handleDragRightStart", event);
+    };
+
+    const handleDragLeftStart = (event: MouseEvent) => {
+      const noteIds = [...store.state.selectedNoteIds, props.note.id];
+      store.dispatch("SET_SELECTED_NOTE_IDS", {
+        noteIds,
+      });
+      emit("handleDragLeftStart", event);
+    };
+
+    return {
+      sizeX,
+      sizeY,
+      zoomX,
+      zoomY,
+      positionX,
+      positionY,
+      barHeight,
+      barWidth,
+      isSelected,
+      removeNote,
+      setLyric,
+      handleKeydown,
+      handleDragRightStart,
+      handleDragLeftStart,
+      handleMouseDown,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.sequencer-note {
+  backface-visibility: hidden;
+  position: absolute;
+  top: 0;
+  left: 0;
+  transform-origin: 0, 0;
+
+  &.selected {
+    .sequencer-note-bar-body {
+      fill: darkorange; // 仮
+      cursor: move;
+    }
+  }
+}
+
+.sequencer-note-lyric {
+  background: white;
+  border: 0;
+  border-bottom: 1px solid colors.$primary-light;
+  color: colors.$display;
+  font-size: 12px;
+  font-weight: bold;
+  font-feature-settings: "palt" 1;
+  letter-spacing: 0.05em;
+  outline: none;
+  padding: 0;
+  position: absolute;
+  bottom: calc(100% - 1px);
+  left: 0;
+  width: 24px;
+}
+
+.sequencer-note-bar {
+  display: block;
+  position: relative;
+}
+.sequencer-note-bar-body {
+  fill: colors.$primary;
+  stroke: #fff;
+  stroke-opacity: 0.5;
+  position: relative;
+  top: 0;
+  left: 0;
+}
+
+.sequencer-note-bar-draghandle {
+  cursor: ew-resize;
+}
+</style>
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index 7c089fc6e8..c0855b302e 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -62,6 +62,9 @@ export const midiKeys = [...Array(128)]
   })
   .reverse();
 
+export const BASE_GRID_SIZE_X = 30;
+export const BASE_GRID_SIZE_Y = 30;
+
 export function round(value: number, digits: number) {
   const powerOf10 = 10 ** digits;
   return Math.round(value * powerOf10) / powerOf10;
diff --git a/src/store/singing.ts b/src/store/singing.ts
index a5b66d7b65..a08b92970a 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -30,6 +30,7 @@ import {
   round,
 } from "@/helpers/singHelper";
 import { AudioQuery } from "@/openapi";
+import { v4 as uuidv4 } from "uuid";
 
 const ticksToSecondsForConstantBpm = (
   resolution: number,
@@ -328,10 +329,11 @@ export const singingStoreState: SingingStoreState = {
   // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
   isShowSinger: true,
   sequencerZoomX: 0.5,
-  sequencerZoomY: 0.5,
+  sequencerZoomY: 0.75,
   sequencerScrollY: 60, // Y軸 midi number
   sequencerScrollX: 0, // X軸 midi duration(仮)
-  sequencerSnapSize: 120, // スナップサイズ 試行用で1/16(ppq=480)のmidi durationで固定
+  sequencerSnapSize: 120, // スナップサイズ 試行用で1/18(ppq=480)のmidi durationで固定
+  selectedNoteIds: [], // 選択中のノート
   nowPlaying: false,
   volume: 0,
   leftLocatorPosition: 0,
@@ -599,10 +601,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   ADD_NOTE: {
     mutation(state, { note }: { note: Note }) {
       if (state.score) {
-        const notes = state.score.notes.concat(note).sort((a, b) => {
-          return a.position - b.position;
-        });
-        state.score.notes = notes;
+        state.selectedNoteIds.push(note.id);
+        state.score.notes = [...state.score.notes, note].sort(
+          (a, b) => a.position - b.position
+        );
       }
     },
     // ノートを追加する
@@ -615,45 +617,119 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         throw new Error("The note is invalid.");
       }
       commit("ADD_NOTE", { note });
-
       dispatch("RENDER");
     },
   },
 
-  CHANGE_NOTE: {
-    mutation(state, { index, note }: { index: number; note: Note }) {
+  UPDATE_NOTE: {
+    mutation(state, { note, index }: { note: Note; index: number }) {
       if (state.score) {
         const notes = [...state.score.notes];
         notes.splice(index, 1, note);
         state.score.notes = notes;
       }
     },
-    async action({ state, commit, dispatch }, { index, note }) {
+    async action({ state, commit, dispatch }, { note }) {
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
       if (!isValidNote(note)) {
         throw new Error("The note is invalid.");
       }
-      commit("CHANGE_NOTE", { index, note });
 
-      dispatch("RENDER");
+      const index = state.score.notes.findIndex((value) => {
+        return value.id === note.id;
+      });
+
+      if (index !== -1) {
+        commit("UPDATE_NOTE", { note, index });
+        dispatch("RENDER");
+      } else {
+        throw new Error("The note is not found.");
+      }
     },
   },
 
   REMOVE_NOTE: {
-    mutation(state, { index }: { index: number }) {
+    mutation(state, { id }: { id: string }) {
+      if (state.score) {
+        state.score.notes = [...state.score.notes].filter(
+          (note) => note.id !== id
+        );
+        state.selectedNoteIds = [...state.selectedNoteIds].filter(
+          (selectedId) => selectedId !== id
+        );
+      }
+    },
+    async action({ state, commit, dispatch }, { id }) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+
+      commit("REMOVE_NOTE", { id });
+      dispatch("RENDER");
+    },
+  },
+
+  REPLACE_ALL_NOTES: {
+    mutation(state, { notes }: { notes: Note[] }) {
       if (state.score) {
-        const notes = [...state.score.notes];
-        notes.splice(index, 1);
         state.score.notes = notes;
       }
     },
-    async action({ state, commit, dispatch }, { index }) {
+    async action({ state, commit, dispatch }, { notes }: { notes: Note[] }) {
+      if (state.score === undefined) {
+        throw new Error("Score is not initialized.");
+      }
+      if (!singChannel) {
+        throw new Error("singChannel is undefined.");
+      }
+      if (notes.some((note) => !isValidNote(note))) {
+        throw new Error("Invalid notes");
+      }
+      commit("REPLACE_ALL_NOTES", { notes });
+
+      dispatch("RENDER");
+    },
+  },
+
+  SET_SELECTED_NOTE_IDS: {
+    mutation(state, { noteIds }: { noteIds: string[] }) {
+      state.selectedNoteIds = noteIds;
+    },
+    async action({ state, commit }, { noteIds }: { noteIds: string[] }) {
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
-      commit("REMOVE_NOTE", { index });
+      commit("SET_SELECTED_NOTE_IDS", { noteIds });
+    },
+  },
+
+  CLEAR_SELECTED_NOTE_IDS: {
+    mutation(state) {
+      state.selectedNoteIds = [];
+    },
+    async action({ commit }) {
+      commit("CLEAR_SELECTED_NOTE_IDS");
+    },
+  },
+
+  // 選択中のノートを削除する
+  REMOVE_SELECTED_NOTES: {
+    mutation(state) {
+      if (state.score) {
+        state.score.notes = [...state.score.notes].filter(
+          (note) => !state.selectedNoteIds.includes(note.id)
+        );
+      }
+    },
+    async action({ commit, dispatch }) {
+      if (!singChannel) {
+        throw new Error("singChannel is undefined.");
+      }
+
+      commit("REMOVE_SELECTED_NOTES");
+      commit("CLEAR_SELECTED_NOTE_IDS");
 
       dispatch("RENDER");
     },
@@ -797,6 +873,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_IS_DRAG: {
+    mutation(state, { isDrag }: { isDrag: boolean }) {
+      state.isDrag = isDrag;
+    },
+    async action({ commit }, { isDrag }) {
+      commit("SET_IS_DRAG", {
+        isDrag,
+      });
+    },
+  },
+
   SET_START_RENDERING_REQUESTED: {
     mutation(state, { startRenderingRequested }) {
       state.startRenderingRequested = startRenderingRequested;
@@ -1208,6 +1295,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         // ひとまず1トラック目のみを読み込む
         midi.tracks[0].notes
           .map((note) => ({
+            id: uuidv4(),
             position: convertToPosBasedOnRes(note.ticks),
             duration: convertToDurationBasedOnRes(
               note.ticks,
@@ -1500,6 +1588,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             duration: duration,
             midi: noteNumber,
             lyric: lyric,
+            id: uuidv4(),
           };
 
           if (tie) {
diff --git a/src/store/type.ts b/src/store/type.ts
index f6cf130dfe..d5c4761e21 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -64,6 +64,7 @@ export type TimeSignature = {
 };
 
 export type Note = {
+  id: string;
   position: number;
   duration: number;
   midi: number;
@@ -700,6 +701,7 @@ export type SingingStoreState = {
   sequencerScrollX: number;
   sequencerScrollY: number;
   sequencerSnapSize: number;
+  selectedNoteIds: string[];
   nowPlaying: boolean;
   volume: number;
   leftLocatorPosition: number;
@@ -755,14 +757,34 @@ export type SingingStoreTypes = {
     action(payload: { note: Note }): void;
   };
 
-  CHANGE_NOTE: {
-    mutation: { index: number; note: Note };
-    action(payload: { index: number; note: Note }): void;
+  UPDATE_NOTE: {
+    mutation: { note: Note; index: number };
+    action(payload: { note: Note }): void;
   };
 
   REMOVE_NOTE: {
-    mutation: { index: number };
-    action(payload: { index: number }): void;
+    mutation: { id: string };
+    action(payload: { id: string }): void;
+  };
+
+  REPLACE_ALL_NOTES: {
+    mutation: { notes: Note[] };
+    action(payload: { notes: Note[] }): void;
+  };
+
+  SET_SELECTED_NOTE_IDS: {
+    mutation: { noteIds: string[] };
+    action(payload: { noteIds: string[] }): void;
+  };
+
+  CLEAR_SELECTED_NOTE_IDS: {
+    mutation: void;
+    action(): void;
+  };
+
+  REMOVE_SELECTED_NOTES: {
+    mutation: void;
+    action(): void;
   };
 
   SET_ZOOM_X: {
@@ -785,6 +807,11 @@ export type SingingStoreTypes = {
     action(payload: { scrollY: number }): void;
   };
 
+  SET_IS_DRAG: {
+    mutation: { isDrag: boolean };
+    action(payload: { isDrag: boolean }): void;
+  };
+
   IMPORT_MIDI_FILE: {
     action(payload: { filePath?: string }): void;
   };
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 7beac9f8b5..3ef4b94124 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -123,6 +123,7 @@ describe("store/vuex.js test", () => {
         sequencerScrollX: 0,
         sequencerScrollY: 60,
         sequencerSnapSize: 120,
+        selectedNoteIds: [],
         nowPlaying: false,
         volume: 0,
         leftLocatorPosition: 0,

From ca98530f129e9c89dad7f52804e893bd6806360a Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 4 Sep 2023 20:28:01 +0900
Subject: [PATCH 13/59] =?UTF-8?q?[project-s]=20=E5=90=84Scheduler=E3=82=92?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=A6=E3=82=B9?=
 =?UTF-8?q?=E3=82=B1=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AA=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E8=A1=8C=E3=81=86=E5=BD=A2=E3=81=AB=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20(#1532)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 各Schedulerを直接使用してスケジューリングを行う形に変更

* コメントを追加

* 修正、コメントを追加
---
 src/infrastructures/AudioRenderer.ts | 385 +++++++++++++++------------
 src/store/singing.ts                 |  24 +-
 2 files changed, 225 insertions(+), 184 deletions(-)

diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 9d05969403..453280d8b7 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -17,64 +17,29 @@ class Timer {
   }
 }
 
-type SchedulableEvent = {
-  readonly time: number;
-  readonly schedule: (contextTime: number) => void;
+export type AudioSequence = {
+  readonly type: "audio";
+  readonly audioPlayer: AudioPlayer;
+  readonly audioEvents: AudioEvent[];
 };
 
-export interface SoundSequence {
-  generateEvents(startTime: number): SchedulableEvent[];
-  scheduleStop(contextTime: number): void;
-}
-
-class SoundScheduler {
-  readonly sequence: SoundSequence;
-  private readonly startContextTime: number;
-  private readonly startTime: number;
-  private readonly events: SchedulableEvent[];
-
-  private index = 0;
-
-  constructor(
-    sequence: SoundSequence,
-    startContextTime: number,
-    startTime: number
-  ) {
-    this.sequence = sequence;
-    this.startContextTime = startContextTime;
-    this.startTime = startTime;
-    this.events = this.sequence.generateEvents(startTime);
-  }
-
-  private calculateContextTime(time: number) {
-    return this.startContextTime + (time - this.startTime);
-  }
-
-  // `time`から`time + period`までの範囲のイベントをスケジュールする
-  scheduleEvents(time: number, period: number) {
-    if (time < this.startTime) {
-      throw new Error("The specified time is invalid.");
-    }
-
-    while (this.index < this.events.length) {
-      const event = this.events[this.index];
-      const eventContextTime = this.calculateContextTime(event.time);
+export type NoteSequence = {
+  readonly type: "note";
+  readonly instrument: Instrument;
+  readonly noteEvents: NoteEvent[];
+};
 
-      if (event.time < time + period) {
-        event.schedule(eventContextTime);
-        this.index++;
-      } else break;
-    }
-  }
+export type Sequence = AudioSequence | NoteSequence;
 
-  stop(contextTime: number) {
-    this.sequence.scheduleStop(contextTime);
-  }
+interface EventScheduler {
+  start(contextTime: number, time: number): void;
+  schedule(untilTime: number): void;
+  stop(contextTime: number): void;
 }
 
 export interface BaseTransport {
-  addSequence(sequence: SoundSequence): void;
-  removeSequence(sequence: SoundSequence): void;
+  addSequence(sequence: Sequence): void;
+  removeSequence(sequence: Sequence): void;
 }
 
 /**
@@ -87,12 +52,11 @@ export class Transport implements BaseTransport {
 
   private _state: "started" | "stopped" = "stopped";
   private _time = 0;
-  private sequences: SoundSequence[] = [];
+  private sequences = new Set<Sequence>();
 
   private startContextTime = 0;
   private startTime = 0;
-  private schedulers: SoundScheduler[] = [];
-  private schedulersToBeStopped: SoundScheduler[] = [];
+  private schedulers = new Map<Sequence, EventScheduler>();
 
   get state() {
     return this._state;
@@ -131,7 +95,7 @@ export class Transport implements BaseTransport {
     this.timer = new Timer(interval * 1000, () => {
       if (this._state === "started") {
         const contextTime = this.audioContext.currentTime;
-        this.scheduleEvents(contextTime);
+        this.schedule(contextTime);
       }
     });
   }
@@ -141,64 +105,65 @@ export class Transport implements BaseTransport {
     return this.startTime + elapsedTime;
   }
 
-  private getScheduler(sequence: SoundSequence) {
-    return this.schedulers.find((value) => {
-      return value.sequence === sequence;
-    });
+  private createScheduler(sequence: Sequence): EventScheduler {
+    if (sequence.type === "audio") {
+      const player = sequence.audioPlayer;
+      const events = sequence.audioEvents;
+      return new AudioEventScheduler(player, events);
+    } else {
+      const instrument = sequence.instrument;
+      const events = sequence.noteEvents;
+      return new NoteEventScheduler(instrument, events);
+    }
   }
 
-  private scheduleEvents(contextTime: number) {
+  private schedule(contextTime: number) {
     const time = this.calculateTime(contextTime);
 
-    this.schedulersToBeStopped.forEach((value) => {
-      value.stop(contextTime);
+    // シーケンスの削除を反映
+    const removedSequences: Sequence[] = [];
+    this.schedulers.forEach((scheduler, sequence) => {
+      if (!this.sequences.has(sequence)) {
+        scheduler.stop(contextTime);
+        removedSequences.push(sequence);
+      }
+    });
+    removedSequences.forEach((sequence) => {
+      this.schedulers.delete(sequence);
     });
-    this.schedulersToBeStopped = [];
 
-    this.sequences.forEach((value) => {
-      let scheduler = this.getScheduler(value);
-      if (!scheduler) {
-        scheduler = new SoundScheduler(value, contextTime, time);
-        this.schedulers.push(scheduler);
+    // シーケンスの追加を反映
+    this.sequences.forEach((sequence) => {
+      if (!this.schedulers.has(sequence)) {
+        const scheduler = this.createScheduler(sequence);
+        scheduler.start(contextTime, time);
+        this.schedulers.set(sequence, scheduler);
       }
-      scheduler.scheduleEvents(time, this.lookAhead);
+    });
+
+    this.schedulers.forEach((scheduler) => {
+      scheduler.schedule(time + this.lookAhead);
     });
   }
 
   /**
    * シーケンスを追加します。再生中に追加した場合は、次のスケジューリングで反映されます。
    */
-  addSequence(sequence: SoundSequence) {
-    const exists = this.sequences.some((value) => {
-      return value === sequence;
-    });
-    if (exists) {
-      throw new Error("The specified sequence has already been added.");
+  addSequence(sequence: Sequence) {
+    if (this.sequences.has(sequence)) {
+      throw new Error("The sequence has already been added.");
     }
-    this.sequences.push(sequence);
+    this.sequences.add(sequence);
   }
 
   /**
    * シーケンスを削除します。再生中に削除した場合は、次のスケジューリングで反映されます。
    */
-  removeSequence(sequence: SoundSequence) {
-    const index = this.sequences.findIndex((value) => {
-      return value === sequence;
-    });
-    if (index === -1) {
-      throw new Error("The specified sequence does not exist.");
-    }
-    this.sequences.splice(index, 1);
-
-    if (this.state === "started") {
-      const index = this.schedulers.findIndex((value) => {
-        return value.sequence === sequence;
-      });
-      if (index === -1) return;
-
-      const removedScheduler = this.schedulers.splice(index, 1)[0];
-      this.schedulersToBeStopped.push(removedScheduler);
+  removeSequence(sequence: Sequence) {
+    if (!this.sequences.has(sequence)) {
+      throw new Error("The sequence does not exist.");
     }
+    this.sequences.delete(sequence);
   }
 
   start() {
@@ -209,10 +174,8 @@ export class Transport implements BaseTransport {
 
     this.startContextTime = contextTime;
     this.startTime = this._time;
-    this.schedulers = [];
-    this.schedulersToBeStopped = [];
 
-    this.scheduleEvents(contextTime);
+    this.schedule(contextTime);
   }
 
   stop() {
@@ -225,9 +188,7 @@ export class Transport implements BaseTransport {
     this.schedulers.forEach((value) => {
       value.stop(contextTime);
     });
-    this.schedulersToBeStopped.forEach((value) => {
-      value.stop(contextTime);
-    });
+    this.schedulers.clear();
   }
 
   dispose() {
@@ -242,32 +203,39 @@ export class Transport implements BaseTransport {
  * 登録されているシーケンスのイベントをスケジュールします。主に保存用途です。
  */
 export class OfflineTransport implements BaseTransport {
-  private sequences: SoundSequence[] = [];
+  private schedulers = new Map<Sequence, EventScheduler>();
 
-  addSequence(sequence: SoundSequence) {
-    const exists = this.sequences.some((value) => {
-      return value === sequence;
-    });
-    if (exists) {
-      throw new Error("The specified sequence has already been added.");
+  private createScheduler(sequence: Sequence): EventScheduler {
+    if (sequence.type === "audio") {
+      const player = sequence.audioPlayer;
+      const events = sequence.audioEvents;
+      return new AudioEventScheduler(player, events);
+    } else {
+      const instrument = sequence.instrument;
+      const events = sequence.noteEvents;
+      return new NoteEventScheduler(instrument, events);
     }
-    this.sequences.push(sequence);
   }
 
-  removeSequence(sequence: SoundSequence) {
-    const index = this.sequences.findIndex((value) => {
-      return value === sequence;
-    });
-    if (index === -1) {
-      throw new Error("The specified sequence does not exist.");
+  addSequence(sequence: Sequence) {
+    if (this.schedulers.has(sequence)) {
+      throw new Error("The sequence has already been added.");
     }
-    this.sequences.splice(index, 1);
+    const scheduler = this.createScheduler(sequence);
+    this.schedulers.set(sequence, scheduler);
   }
 
-  scheduleEvents(startTime: number, period: number) {
-    this.sequences.forEach((value) => {
-      const scheduler = new SoundScheduler(value, 0, startTime);
-      scheduler.scheduleEvents(0, period);
+  removeSequence(sequence: Sequence) {
+    if (!this.schedulers.has(sequence)) {
+      throw new Error("The sequence does not exist.");
+    }
+    this.schedulers.delete(sequence);
+  }
+
+  schedule(startTime: number, period: number) {
+    this.schedulers.forEach((scheduler) => {
+      scheduler.start(0, startTime);
+      scheduler.schedule(period);
       scheduler.stop(period);
     });
   }
@@ -278,37 +246,71 @@ export type AudioEvent = {
   readonly buffer: AudioBuffer;
 };
 
-export class AudioSequence implements SoundSequence {
-  private readonly audioPlayer: AudioPlayer;
-  private readonly audioEvents: AudioEvent[];
+/**
+ * オーディオイベントをスケジュールします。
+ * 使い捨てで、startメソッドは一度しか呼び出せません。
+ */
+class AudioEventScheduler implements EventScheduler {
+  private readonly player: AudioPlayer;
+  private readonly events: AudioEvent[];
+
+  private isStarted = false;
+  private startContextTime = 0;
+  private startTime = 0;
+  private index = 0;
 
   constructor(audioPlayer: AudioPlayer, audioEvents: AudioEvent[]) {
-    this.audioPlayer = audioPlayer;
-    this.audioEvents = audioEvents;
-  }
-
-  // スケジュール可能なイベントを生成する
-  generateEvents(startTime: number) {
-    return this.audioEvents
-      .sort((a, b) => a.time - b.time)
-      .filter((value) => {
-        const audioEndTime = value.time + value.buffer.duration;
-        return audioEndTime > startTime;
-      })
-      .map((value): SchedulableEvent => {
-        const offset = Math.max(startTime - value.time, 0);
-        return {
-          time: Math.max(value.time, startTime),
-          schedule: (contextTime: number) => {
-            this.audioPlayer.play(contextTime, offset, value.buffer);
-          },
-        };
-      });
+    this.player = audioPlayer;
+    this.events = [...audioEvents];
+    this.events.sort((a, b) => a.time - b.time);
   }
 
-  // シーケンスの停止をスケジュールする
-  scheduleStop(contextTime: number) {
-    this.audioPlayer.allStop(contextTime);
+  start(contextTime: number, time: number) {
+    if (this.isStarted) {
+      throw new Error("Already started.");
+    }
+
+    this.startContextTime = contextTime;
+    this.startTime = time;
+    this.index = this.events.length;
+
+    // 最初にスケジュールするイベントのインデックスを調べて設定する
+    for (let i = 0; i < this.events.length; i++) {
+      const event = this.events[i];
+      const eventEndTime = event.time + event.buffer.duration;
+      if (eventEndTime > time) {
+        this.index = i;
+        break;
+      }
+    }
+
+    this.isStarted = true;
+  }
+
+  schedule(untilTime: number) {
+    if (!this.isStarted) {
+      throw new Error("Not started.");
+    }
+
+    while (this.index < this.events.length) {
+      const event = this.events[this.index];
+      const offset = Math.max(this.startTime - event.time, 0);
+      const contextTime =
+        this.startContextTime + (event.time + offset - this.startTime);
+
+      if (event.time < untilTime) {
+        this.player.play(contextTime, offset, event.buffer);
+        this.index++;
+      } else break;
+    }
+  }
+
+  stop(contextTime: number) {
+    if (!this.isStarted) {
+      throw new Error("Not started.");
+    }
+
+    this.player.allStop(contextTime);
   }
 }
 
@@ -324,40 +326,71 @@ export type NoteEvent = {
   readonly midi: number;
 };
 
-export class NoteSequence implements SoundSequence {
+/**
+ * ノートイベントをスケジュールします。
+ * 使い捨てで、startメソッドは一度しか呼び出せません。
+ */
+class NoteEventScheduler implements EventScheduler {
   private readonly instrument: Instrument;
-  private readonly noteEvents: NoteEvent[];
+  private readonly events: NoteEvent[];
+
+  private isStarted = false;
+  private startContextTime = 0;
+  private startTime = 0;
+  private index = 0;
 
   constructor(instrument: Instrument, noteEvents: NoteEvent[]) {
     this.instrument = instrument;
-    this.noteEvents = noteEvents;
-  }
-
-  // スケジュール可能なイベントを生成する
-  generateEvents(startTime: number) {
-    return this.noteEvents
-      .sort((a, b) => a.noteOnTime - b.noteOnTime)
-      .filter((value) => value.noteOffTime > startTime)
-      .map((value): SchedulableEvent[] => [
-        {
-          time: Math.max(value.noteOnTime, startTime),
-          schedule: (contextTime: number) => {
-            this.instrument.noteOn(contextTime, value.midi);
-          },
-        },
-        {
-          time: value.noteOffTime,
-          schedule: (contextTime: number) => {
-            this.instrument.noteOff(contextTime, value.midi);
-          },
-        },
-      ])
-      .flat()
-      .sort((a, b) => a.time - b.time);
-  }
-
-  // シーケンスの停止をスケジュールする
-  scheduleStop(contextTime: number) {
+    this.events = [...noteEvents];
+    this.events.sort((a, b) => a.noteOnTime - b.noteOnTime);
+  }
+
+  start(contextTime: number, time: number) {
+    if (this.isStarted) {
+      throw new Error("Already started.");
+    }
+
+    this.startContextTime = contextTime;
+    this.startTime = time;
+    this.index = this.events.length;
+
+    // 最初にスケジュールするイベントのインデックスを調べて設定する
+    for (let i = 0; i < this.events.length; i++) {
+      if (this.events[i].noteOffTime > time) {
+        this.index = i;
+        break;
+      }
+    }
+
+    this.isStarted = true;
+  }
+
+  schedule(untilTime: number) {
+    if (!this.isStarted) {
+      throw new Error("Not started.");
+    }
+
+    while (this.index < this.events.length) {
+      const event = this.events[this.index];
+      const noteOnTime = Math.max(event.noteOnTime, this.startTime);
+      const noteOnContextTime =
+        this.startContextTime + (noteOnTime - this.startTime);
+      const noteOffContextTime =
+        this.startContextTime + (event.noteOffTime - this.startTime);
+
+      if (event.noteOnTime < untilTime) {
+        this.instrument.noteOn(noteOnContextTime, event.midi);
+        this.instrument.noteOff(noteOffContextTime, event.midi);
+        this.index++;
+      } else break;
+    }
+  }
+
+  stop(contextTime: number) {
+    if (!this.isStarted) {
+      throw new Error("Not started.");
+    }
+
     this.instrument.allSoundOff(contextTime);
   }
 }
@@ -696,7 +729,7 @@ export class AudioRenderer {
     const transport = new OfflineTransport();
 
     callback({ audioContext, transport });
-    transport.scheduleEvents(startTime, duration);
+    transport.schedule(startTime, duration);
     const audioBuffer = await audioContext.startRendering();
     return audioBuffer;
   }
diff --git a/src/store/singing.ts b/src/store/singing.ts
index a08b92970a..715044c03f 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -6,7 +6,7 @@ import {
   Context,
   NoteEvent,
   NoteSequence,
-  SoundSequence,
+  Sequence,
   Synth,
   Transport,
 } from "@/infrastructures/AudioRenderer";
@@ -193,7 +193,7 @@ class SingChannel {
   private readonly gainNode: GainNode;
 
   private phrases: Phrase[] = [];
-  private sequences: SoundSequence[] = [];
+  private sequences: Sequence[] = [];
 
   get volume() {
     return this.gainNode.gain.value;
@@ -215,7 +215,6 @@ class SingChannel {
   addPhrase(phrase: Phrase) {
     this.phrases.push(phrase);
 
-    let sequence: SoundSequence | undefined;
     if (phrase.startTime !== undefined && phrase.buffer) {
       const audioEvents: AudioEvent[] = [
         {
@@ -225,7 +224,13 @@ class SingChannel {
       ];
       const audioPlayer = new AudioPlayer(this.context);
       audioPlayer.connect(this.gainNode);
-      sequence = new AudioSequence(audioPlayer, audioEvents);
+      const audioSequence: AudioSequence = {
+        type: "audio",
+        audioPlayer,
+        audioEvents,
+      };
+      this.context.transport.addSequence(audioSequence);
+      this.sequences.push(audioSequence);
     } else {
       const noteEvents = generateNoteEvents(
         phrase.score.resolution,
@@ -234,11 +239,14 @@ class SingChannel {
       );
       const synth = new Synth(this.context);
       synth.connect(this.gainNode);
-      sequence = new NoteSequence(synth, noteEvents);
+      const noteSequence: NoteSequence = {
+        type: "note",
+        instrument: synth,
+        noteEvents,
+      };
+      this.context.transport.addSequence(noteSequence);
+      this.sequences.push(noteSequence);
     }
-
-    this.context.transport.addSequence(sequence);
-    this.sequences.push(sequence);
   }
 
   removePhrase(phrase: Phrase) {

From 18a86c72f9819aa8bcbde385309fd82e35034c12 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 11 Sep 2023 19:13:01 +0900
Subject: [PATCH 14/59] =?UTF-8?q?[project-s]=20=E3=82=B7=E3=83=BC=E3=82=B1?=
 =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=83=BB=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=E3=82=92=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB?=
 =?UTF-8?q?=E5=86=85=E3=81=A7=E8=A1=8C=E3=82=8F=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B=20(#1536)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/infrastructures/AudioRenderer.ts |  42 ++++++
 src/store/singing.ts                 | 217 +++++++++++++--------------
 2 files changed, 145 insertions(+), 114 deletions(-)

diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 453280d8b7..4b362943d6 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -315,6 +315,8 @@ class AudioEventScheduler implements EventScheduler {
 }
 
 export interface Instrument {
+  connect(destination: AudioNode): void;
+  disconnect(): void;
   noteOn(contextTime: number, midi: number): void;
   noteOff(contextTime: number, midi: number): void;
   allSoundOff(contextTime?: number): void;
@@ -675,6 +677,46 @@ export class Synth implements Instrument {
   }
 }
 
+export type ChannelStripOptions = {
+  readonly volume: number;
+};
+
+/**
+ * ミキサーの1チャンネル分の機能を持つモジュールです。
+ */
+export class ChannelStrip {
+  private readonly gainNode: GainNode;
+
+  get inputNode(): AudioNode {
+    return this.gainNode;
+  }
+
+  get volume() {
+    return this.gainNode.gain.value;
+  }
+
+  set volume(value: number) {
+    this.gainNode.gain.value = value;
+  }
+
+  constructor(
+    context: Context,
+    options: ChannelStripOptions = { volume: 0.1 }
+  ) {
+    const audioContext = context.audioContext;
+    this.gainNode = audioContext.createGain();
+    this.gainNode.gain.value = options.volume;
+  }
+
+  connect(destination: AudioNode) {
+    this.gainNode.connect(destination);
+  }
+
+  disconnect() {
+    this.gainNode.disconnect();
+  }
+}
+
 export type Context = {
   readonly audioContext: BaseAudioContext;
   readonly transport: BaseTransport;
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 715044c03f..4f486e46ca 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -3,7 +3,8 @@ import {
   AudioPlayer,
   AudioRenderer,
   AudioSequence,
-  Context,
+  ChannelStrip,
+  Instrument,
   NoteEvent,
   NoteSequence,
   Sequence,
@@ -171,6 +172,8 @@ type Phrase = {
   queryHash?: string; // queryの変更を検知するためのハッシュ
   buffer?: AudioBuffer;
   startTime?: number;
+  source?: Instrument | AudioPlayer; // ひとまずPhraseに持たせる
+  sequence?: Sequence; // ひとまずPhraseに持たせる
 };
 
 const generateSingerAndScoreHash = async (obj: {
@@ -184,92 +187,6 @@ const generateAudioQueryHash = async (obj: AudioQuery) => {
   return _generateHash(obj);
 };
 
-type ChannelOptions = {
-  readonly volume: number;
-};
-
-class SingChannel {
-  private readonly context: Context;
-  private readonly gainNode: GainNode;
-
-  private phrases: Phrase[] = [];
-  private sequences: Sequence[] = [];
-
-  get volume() {
-    return this.gainNode.gain.value;
-  }
-
-  set volume(value: number) {
-    this.gainNode.gain.value = value;
-  }
-
-  constructor(context: Context, options: ChannelOptions = { volume: 0.1 }) {
-    this.context = context;
-    const audioContext = context.audioContext;
-
-    this.gainNode = audioContext.createGain();
-    this.gainNode.connect(audioContext.destination);
-    this.gainNode.gain.value = options.volume;
-  }
-
-  addPhrase(phrase: Phrase) {
-    this.phrases.push(phrase);
-
-    if (phrase.startTime !== undefined && phrase.buffer) {
-      const audioEvents: AudioEvent[] = [
-        {
-          time: phrase.startTime,
-          buffer: phrase.buffer,
-        },
-      ];
-      const audioPlayer = new AudioPlayer(this.context);
-      audioPlayer.connect(this.gainNode);
-      const audioSequence: AudioSequence = {
-        type: "audio",
-        audioPlayer,
-        audioEvents,
-      };
-      this.context.transport.addSequence(audioSequence);
-      this.sequences.push(audioSequence);
-    } else {
-      const noteEvents = generateNoteEvents(
-        phrase.score.resolution,
-        phrase.score.tempos,
-        phrase.score.notes
-      );
-      const synth = new Synth(this.context);
-      synth.connect(this.gainNode);
-      const noteSequence: NoteSequence = {
-        type: "note",
-        instrument: synth,
-        noteEvents,
-      };
-      this.context.transport.addSequence(noteSequence);
-      this.sequences.push(noteSequence);
-    }
-  }
-
-  removePhrase(phrase: Phrase) {
-    const index = this.phrases.findIndex((value) => {
-      return value === phrase;
-    });
-    if (index === -1) {
-      throw new Error("The specified phrase does not exist.");
-    }
-    this.phrases.splice(index, 1);
-
-    const sequence = this.sequences[index];
-    this.context.transport.removeSequence(sequence);
-    this.sequences.splice(index, 1);
-  }
-
-  dispose() {
-    this.sequences.forEach((value) => {
-      this.context.transport.removeSequence(value);
-    });
-  }
-}
-
 const isValidTempo = (tempo: Tempo) => {
   return (
     Number.isInteger(tempo.position) &&
@@ -316,13 +233,15 @@ const DEFAULT_BEAT_TYPE = 4;
 
 let audioRenderer: AudioRenderer | undefined;
 let transport: Transport | undefined;
-let singChannel: SingChannel | undefined;
+let channelStrip: ChannelStrip | undefined;
 
 // テスト時はAudioContextが存在しないのでAudioRendererを作らない
 if (window.AudioContext) {
   audioRenderer = new AudioRenderer();
   transport = audioRenderer.transport;
-  singChannel = new SingChannel(audioRenderer.context);
+  channelStrip = new ChannelStrip(audioRenderer.context);
+
+  channelStrip.connect(audioRenderer.audioContext.destination);
 }
 
 let playbackPosition = 0;
@@ -689,9 +608,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (state.score === undefined) {
         throw new Error("Score is not initialized.");
       }
-      if (!singChannel) {
-        throw new Error("singChannel is undefined.");
-      }
       if (notes.some((note) => !isValidNote(note))) {
         throw new Error("Invalid notes");
       }
@@ -732,10 +648,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       }
     },
     async action({ commit, dispatch }) {
-      if (!singChannel) {
-        throw new Error("singChannel is undefined.");
-      }
-
       commit("REMOVE_SELECTED_NOTES");
       commit("CLEAR_SELECTED_NOTE_IDS");
 
@@ -872,12 +784,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.volume = volume;
     },
     async action({ commit }, { volume }) {
-      if (!singChannel) {
-        throw new Error("singChannel is undefined.");
+      if (!channelStrip) {
+        throw new Error("channelStrip is undefined.");
       }
       commit("SET_VOLUME", { volume });
 
-      singChannel.volume = volume;
+      channelStrip.volume = volume;
     },
   },
 
@@ -1114,13 +1026,14 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       const stopRenderingRequested = () => state.stopRenderingRequested;
 
       const render = async () => {
-        if (!state.score || !singChannel || !audioRenderer) {
+        if (!state.score || !audioRenderer || !transport || !channelStrip) {
           throw new Error(
-            "score or singChannel or audioRenderer is undefined."
+            "score or audioRenderer or transport or channelStrip is undefined."
           );
         }
-        const singChannelRef = singChannel;
         const audioRendererRef = audioRenderer;
+        const transportRef = transport;
+        const channelStripRef = channelStrip;
 
         // レンダリング中に変更される可能性のあるデータをコピーする
         const score = copyScore(state.score);
@@ -1136,13 +1049,36 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         for (const [hash, phrase] of foundPhrases) {
           if (!allPhrases.has(hash)) {
             allPhrases.set(hash, phrase);
-            singChannelRef.addPhrase(phrase);
+            // フレーズ追加時の処理
+            const noteEvents = generateNoteEvents(
+              phrase.score.resolution,
+              phrase.score.tempos,
+              phrase.score.notes
+            );
+            const context = audioRendererRef.context;
+            const synth = new Synth(context);
+            synth.connect(channelStripRef.inputNode);
+            const noteSequence: NoteSequence = {
+              type: "note",
+              instrument: synth,
+              noteEvents,
+            };
+            transportRef.addSequence(noteSequence);
+
+            phrase.source = synth;
+            phrase.sequence = noteSequence;
           }
         }
         for (const [hash, phrase] of allPhrases) {
           if (!foundPhrases.has(hash)) {
             allPhrases.delete(hash);
-            singChannelRef.removePhrase(phrase);
+            // フレーズ削除時の処理
+            if (phrase.source) {
+              phrase.source.disconnect();
+            }
+            if (phrase.sequence) {
+              transportRef.removeSequence(phrase.sequence);
+            }
           }
         }
 
@@ -1195,11 +1131,32 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             phrase.queryHash = queryHash;
             phrase.startTime = calculateStartTime(phrase.score, phrase.query);
 
-            // NoteSequenceが削除される
-            singChannelRef.removePhrase(phrase);
-            // AudioBufferとstartTimeを元にAudioSequenceが作成され、追加される
-            // TODO: 分かりにくいのでリファクタリングする
-            singChannelRef.addPhrase(phrase);
+            // 音源とシーケンスを作成し直して、再接続する
+            if (phrase.source) {
+              phrase.source.disconnect();
+            }
+            if (phrase.sequence) {
+              transportRef.removeSequence(phrase.sequence);
+            }
+
+            const context = audioRendererRef.context;
+            const audioPlayer = new AudioPlayer(context);
+            const audioEvents: AudioEvent[] = [
+              {
+                time: phrase.startTime,
+                buffer: phrase.buffer,
+              },
+            ];
+            const audioSequence: AudioSequence = {
+              type: "audio",
+              audioPlayer,
+              audioEvents,
+            };
+            audioPlayer.connect(channelStripRef.inputNode);
+            transportRef.addSequence(audioSequence);
+
+            phrase.source = audioPlayer;
+            phrase.sequence = audioSequence;
           }
 
           if (startRenderingRequested() || stopRenderingRequested()) {
@@ -1794,11 +1751,43 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           renderStartTime,
           renderDuration,
           (context) => {
-            // SingChannelインスタンスはこの関数を抜けると解放されますが、
-            // コンテキストにはノードや発音が登録されているので問題なくレンダリングされます
-            // TODO: 分かりにくいので後でリファクタリングしたい
-            const channel = new SingChannel(context);
-            allPhrases.forEach((value) => channel.addPhrase(value));
+            const channelStrip = new ChannelStrip(context);
+            for (const phrase of allPhrases.values()) {
+              // TODO: この辺りの処理を共通化する
+              if (phrase.startTime !== undefined && phrase.buffer) {
+                // レンダリング済みのフレーズの場合
+                const audioEvents: AudioEvent[] = [
+                  {
+                    time: phrase.startTime,
+                    buffer: phrase.buffer,
+                  },
+                ];
+                const audioPlayer = new AudioPlayer(context);
+                audioPlayer.connect(channelStrip.inputNode);
+                const audioSequence: AudioSequence = {
+                  type: "audio",
+                  audioPlayer,
+                  audioEvents,
+                };
+                context.transport.addSequence(audioSequence);
+              } else {
+                // レンダリング未完了のフレーズの場合
+                const noteEvents = generateNoteEvents(
+                  phrase.score.resolution,
+                  phrase.score.tempos,
+                  phrase.score.notes
+                );
+                const synth = new Synth(context);
+                synth.connect(channelStrip.inputNode);
+                const noteSequence: NoteSequence = {
+                  type: "note",
+                  instrument: synth,
+                  noteEvents,
+                };
+                context.transport.addSequence(noteSequence);
+              }
+            }
+            channelStrip.connect(context.audioContext.destination);
           }
         );
         const waveFileData = convertToWavFileData(audioBuffer);

From e3ac2c7e7086e70e0f2fdd43f1555b4007c5a60e Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 21 Sep 2023 02:17:27 +0900
Subject: [PATCH 15/59] =?UTF-8?q?[project-s]=20AudioRenderer.ts=E3=81=AE?=
 =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=B0=E3=81=A8=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20(#1571)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/infrastructures/AudioRenderer.ts | 433 ++++++++++++++++++++-------
 src/store/singing.ts                 |  30 +-
 2 files changed, 333 insertions(+), 130 deletions(-)

diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 4b362943d6..0b040fa536 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -1,6 +1,13 @@
+/**
+ * スケジューリングで使用するタイマーです。
+ */
 class Timer {
   private timeoutId?: number;
 
+  /**
+   * @param interval 関数の呼び出し間隔（ミリ秒）
+   * @param callback 呼び出される関数
+   */
   constructor(interval: number, callback: () => void) {
     const tick = () => {
       callback();
@@ -9,6 +16,9 @@ class Timer {
     tick();
   }
 
+  /**
+   * 破棄します。
+   */
   dispose() {
     if (this.timeoutId !== undefined) {
       window.clearTimeout(this.timeoutId);
@@ -31,24 +41,56 @@ export type NoteSequence = {
 
 export type Sequence = AudioSequence | NoteSequence;
 
+/**
+ * イベントのスケジューリングを行うスケジューラーを表します。
+ * スケジューリングの開始位置と停止位置をまたぐイベントも適切にスケジュールされます。
+ */
 interface EventScheduler {
+  /**
+   * スケジューリングを開始します。
+   * @param contextTime スケジューリングを開始する時刻（コンテキスト時間）
+   * @param time スケジューリングの開始位置
+   */
   start(contextTime: number, time: number): void;
+
+  /**
+   * 指定された位置までスケジューリングを行います。
+   * @param untilTime どこまでスケジューリングを行うかを表す位置
+   */
   schedule(untilTime: number): void;
+
+  /**
+   * スケジューリングを停止します。
+   * @param contextTime スケジューリングを停止する時刻（コンテキスト時間）
+   */
   stop(contextTime: number): void;
 }
 
+/**
+ * 複数のシーケンスのスケジューリングを行うトランスポートを表します。
+ */
 export interface BaseTransport {
+  /**
+   * シーケンスを追加します。
+   * @param sequence 追加するシーケンス
+   */
   addSequence(sequence: Sequence): void;
+
+  /**
+   * シーケンスを削除します。
+   * @param sequence 削除するシーケンス
+   */
   removeSequence(sequence: Sequence): void;
 }
 
 /**
- * 登録されているシーケンスのイベントをスケジュールし、再生を行います。
+ * 複数のシーケンスのスケジューリングを行います。
+ * 再生、停止、再生位置の変更などの機能を提供します。
  */
 export class Transport implements BaseTransport {
   private readonly audioContext: AudioContext;
   private readonly timer: Timer;
-  private readonly lookAhead: number;
+  private readonly scheduleAheadTime: number;
 
   private _state: "started" | "stopped" = "stopped";
   private _time = 0;
@@ -62,10 +104,15 @@ export class Transport implements BaseTransport {
     return this._state;
   }
 
+  /**
+   * 再生位置（秒）
+   */
   get time() {
     if (this._state === "started") {
+      // 再生中の場合は、現在時刻から再生位置を計算する
       const contextTime = this.audioContext.currentTime;
-      this._time = this.calculateTime(contextTime);
+      const elapsedTime = contextTime - this.startContextTime;
+      this._time = this.startTime + elapsedTime;
     }
     return this._time;
   }
@@ -81,30 +128,35 @@ export class Transport implements BaseTransport {
   }
 
   /**
-   * @param audioContext コンテキスト時間の取得に使用するAudioContext。
-   * @param interval スケジューリングを行う間隔。
-   * @param lookAhead スケジューリングで先読みする時間。スケジューリングが遅れた場合でも正しく再生されるように、スケジューリングを行う間隔より長く設定する必要があります。
+   * @param audioContext 音声コンテキスト
+   * @param lookahead スケジューリングの間隔（秒）
+   * @param scheduleAheadTime 先読みする時間（秒）（スケジューリングの間隔より長く設定する必要があります）
    */
-  constructor(audioContext: AudioContext, interval: number, lookAhead: number) {
-    if (lookAhead <= interval) {
-      throw new Error("Look-ahead time must be longer than the interval.");
+  constructor(
+    audioContext: AudioContext,
+    lookahead: number,
+    scheduleAheadTime: number
+  ) {
+    if (scheduleAheadTime <= lookahead) {
+      throw new Error(
+        "The scheduleAheadTime must be longer than the lookahead."
+      );
     }
 
     this.audioContext = audioContext;
-    this.lookAhead = lookAhead;
-    this.timer = new Timer(interval * 1000, () => {
+    this.scheduleAheadTime = scheduleAheadTime;
+    this.timer = new Timer(lookahead * 1000, () => {
       if (this._state === "started") {
-        const contextTime = this.audioContext.currentTime;
-        this.schedule(contextTime);
+        this.schedule(this.audioContext.currentTime);
       }
     });
   }
 
-  private calculateTime(contextTime: number) {
-    const elapsedTime = contextTime - this.startContextTime;
-    return this.startTime + elapsedTime;
-  }
-
+  /**
+   * スケジューラーを作成します。
+   * @param sequence スケジューラーでスケジューリングを行うシーケンス
+   * @returns 作成したスケジューラー
+   */
   private createScheduler(sequence: Sequence): EventScheduler {
     if (sequence.type === "audio") {
       const player = sequence.audioPlayer;
@@ -117,8 +169,14 @@ export class Transport implements BaseTransport {
     }
   }
 
+  /**
+   * スケジューリングを行います。
+   * @param contextTime スケジューリングを行う時刻（コンテキスト時間）
+   */
   private schedule(contextTime: number) {
-    const time = this.calculateTime(contextTime);
+    // 再生位置を計算
+    const elapsedTime = contextTime - this.startContextTime;
+    const time = this.startTime + elapsedTime;
 
     // シーケンスの削除を反映
     const removedSequences: Sequence[] = [];
@@ -142,12 +200,13 @@ export class Transport implements BaseTransport {
     });
 
     this.schedulers.forEach((scheduler) => {
-      scheduler.schedule(time + this.lookAhead);
+      scheduler.schedule(time + this.scheduleAheadTime);
     });
   }
 
   /**
    * シーケンスを追加します。再生中に追加した場合は、次のスケジューリングで反映されます。
+   * @param sequence 追加するシーケンス
    */
   addSequence(sequence: Sequence) {
     if (this.sequences.has(sequence)) {
@@ -158,6 +217,7 @@ export class Transport implements BaseTransport {
 
   /**
    * シーケンスを削除します。再生中に削除した場合は、次のスケジューリングで反映されます。
+   * @param sequence 削除するシーケンス
    */
   removeSequence(sequence: Sequence) {
     if (!this.sequences.has(sequence)) {
@@ -166,6 +226,9 @@ export class Transport implements BaseTransport {
     this.sequences.delete(sequence);
   }
 
+  /**
+   * 再生を開始します。すでに再生中の場合は何も行いません。
+   */
   start() {
     if (this._state === "started") return;
     const contextTime = this.audioContext.currentTime;
@@ -178,10 +241,16 @@ export class Transport implements BaseTransport {
     this.schedule(contextTime);
   }
 
+  /**
+   * 再生を停止します。すでに停止している場合は何も行いません。
+   */
   stop() {
     if (this._state === "stopped") return;
     const contextTime = this.audioContext.currentTime;
-    this._time = this.calculateTime(contextTime);
+
+    // 停止する前に再生位置を更新する
+    const elapsedTime = contextTime - this.startContextTime;
+    this._time = this.startTime + elapsedTime;
 
     this._state = "stopped";
 
@@ -191,6 +260,9 @@ export class Transport implements BaseTransport {
     this.schedulers.clear();
   }
 
+  /**
+   * 破棄します。
+   */
   dispose() {
     if (this.state === "started") {
       this.stop();
@@ -200,11 +272,17 @@ export class Transport implements BaseTransport {
 }
 
 /**
- * 登録されているシーケンスのイベントをスケジュールします。主に保存用途です。
+ * 複数のシーケンスのスケジューリングを行います。
+ * オフラインレンダリングで使用します。
  */
 export class OfflineTransport implements BaseTransport {
   private schedulers = new Map<Sequence, EventScheduler>();
 
+  /**
+   * スケジューラーを作成します。
+   * @param sequence スケジューラーでスケジューリングを行うシーケンス
+   * @returns 作成したスケジューラー
+   */
   private createScheduler(sequence: Sequence): EventScheduler {
     if (sequence.type === "audio") {
       const player = sequence.audioPlayer;
@@ -217,6 +295,10 @@ export class OfflineTransport implements BaseTransport {
     }
   }
 
+  /**
+   * シーケンスを追加します。
+   * @param sequence 追加するシーケンス
+   */
   addSequence(sequence: Sequence) {
     if (this.schedulers.has(sequence)) {
       throw new Error("The sequence has already been added.");
@@ -225,6 +307,10 @@ export class OfflineTransport implements BaseTransport {
     this.schedulers.set(sequence, scheduler);
   }
 
+  /**
+   * シーケンスを削除します。
+   * @param sequence 削除するシーケンス
+   */
   removeSequence(sequence: Sequence) {
     if (!this.schedulers.has(sequence)) {
       throw new Error("The sequence does not exist.");
@@ -232,11 +318,16 @@ export class OfflineTransport implements BaseTransport {
     this.schedulers.delete(sequence);
   }
 
-  schedule(startTime: number, period: number) {
+  /**
+   * スケジューリングを行います。
+   * @param startTime スケジューリングの開始位置（秒）
+   * @param duration スケジューリングの長さ（秒）
+   */
+  schedule(startTime: number, duration: number) {
     this.schedulers.forEach((scheduler) => {
       scheduler.start(0, startTime);
-      scheduler.schedule(period);
-      scheduler.stop(period);
+      scheduler.schedule(duration);
+      scheduler.stop(duration);
     });
   }
 }
@@ -247,8 +338,8 @@ export type AudioEvent = {
 };
 
 /**
- * オーディオイベントをスケジュールします。
- * 使い捨てで、startメソッドは一度しか呼び出せません。
+ * オーディオイベントのスケジューリングを行うスケジューラーです。
+ * スケジューリングの開始位置と停止位置をまたぐイベントも適切にスケジュールされます。
  */
 class AudioEventScheduler implements EventScheduler {
   private readonly player: AudioPlayer;
@@ -265,6 +356,12 @@ class AudioEventScheduler implements EventScheduler {
     this.events.sort((a, b) => a.time - b.time);
   }
 
+  /**
+   * スケジューリングを開始します。
+   * このメソッドは一度しか呼び出せません。
+   * @param contextTime スケジューリングを開始する時刻（コンテキスト時間）
+   * @param time スケジューリングの開始位置
+   */
   start(contextTime: number, time: number) {
     if (this.isStarted) {
       throw new Error("Already started.");
@@ -287,6 +384,10 @@ class AudioEventScheduler implements EventScheduler {
     this.isStarted = true;
   }
 
+  /**
+   * 指定された位置までスケジューリングを行います。
+   * @param untilTime どこまでスケジューリングを行うかを表す位置
+   */
   schedule(untilTime: number) {
     if (!this.isStarted) {
       throw new Error("Not started.");
@@ -305,6 +406,10 @@ class AudioEventScheduler implements EventScheduler {
     }
   }
 
+  /**
+   * スケジューリングを停止します。
+   * @param contextTime スケジューリングを停止する時刻（コンテキスト時間）
+   */
   stop(contextTime: number) {
     if (!this.isStarted) {
       throw new Error("Not started.");
@@ -314,12 +419,36 @@ class AudioEventScheduler implements EventScheduler {
   }
 }
 
+/**
+ * 楽器を表します。
+ */
 export interface Instrument {
-  connect(destination: AudioNode): void;
-  disconnect(): void;
+  readonly output: AudioNode;
+
+  /**
+   * ノートオンをスケジュールします。
+   * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。
+   * @param contextTime ノートオンを行う時刻（コンテキスト時間）
+   * @param midi MIDIノート番号
+   */
   noteOn(contextTime: number, midi: number): void;
+
+  /**
+   * ノートオフをスケジュールします。
+   * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   * @param midi MIDIノート番号
+   */
   noteOff(contextTime: number, midi: number): void;
-  allSoundOff(contextTime?: number): void;
+
+  /**
+   * 発音中のすべての音に対して、ノートオフのスケジュールを行います。
+   * すでにノートオフがスケジュールされている音の場合は、
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
+   * 指定された時刻で再スケジュールを行います。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   */
+  allNotesOff(contextTime: number): void;
 }
 
 export type NoteEvent = {
@@ -329,8 +458,8 @@ export type NoteEvent = {
 };
 
 /**
- * ノートイベントをスケジュールします。
- * 使い捨てで、startメソッドは一度しか呼び出せません。
+ * ノートイベントのスケジューリングを行うスケジューラーです。
+ * スケジューリングの開始位置と停止位置をまたぐイベントも適切にスケジュールされます。
  */
 class NoteEventScheduler implements EventScheduler {
   private readonly instrument: Instrument;
@@ -347,6 +476,12 @@ class NoteEventScheduler implements EventScheduler {
     this.events.sort((a, b) => a.noteOnTime - b.noteOnTime);
   }
 
+  /**
+   * スケジューリングを開始します。
+   * このメソッドは一度しか呼び出せません。
+   * @param contextTime スケジューリングを開始する時刻（コンテキスト時間）
+   * @param time スケジューリングの開始位置
+   */
   start(contextTime: number, time: number) {
     if (this.isStarted) {
       throw new Error("Already started.");
@@ -367,6 +502,10 @@ class NoteEventScheduler implements EventScheduler {
     this.isStarted = true;
   }
 
+  /**
+   * 指定された位置までスケジューリングを行います。
+   * @param untilTime どこまでスケジューリングを行うかを表す位置
+   */
   schedule(untilTime: number) {
     if (!this.isStarted) {
       throw new Error("Not started.");
@@ -388,15 +527,22 @@ class NoteEventScheduler implements EventScheduler {
     }
   }
 
+  /**
+   * スケジューリングを停止します。
+   * @param contextTime スケジューリングを停止する時刻（コンテキスト時間）
+   */
   stop(contextTime: number) {
     if (!this.isStarted) {
       throw new Error("Not started.");
     }
 
-    this.instrument.allSoundOff(contextTime);
+    this.instrument.allNotesOff(contextTime);
   }
 }
 
+/**
+ * オーディオプレイヤーのボイスです。音声の再生を行います。
+ */
 class AudioPlayerVoice {
   private readonly audioBufferSourceNode: AudioBufferSourceNode;
   private readonly buffer: AudioBuffer;
@@ -404,6 +550,10 @@ class AudioPlayerVoice {
   private _isStopped = false;
   private stopContextTime?: number;
 
+  get output(): AudioNode {
+    return this.audioBufferSourceNode;
+  }
+
   get isStopped() {
     return this._isStopped;
   }
@@ -417,22 +567,34 @@ class AudioPlayerVoice {
     this.buffer = buffer;
   }
 
-  connect(destination: AudioNode) {
-    this.audioBufferSourceNode.connect(destination);
-  }
-
+  /**
+   * 音声の再生をスケジュールします。
+   * このメソッドは一度しか呼び出せません。
+   * @param contextTime 再生を行う時刻（コンテキスト時間）
+   * @param offset オフセット（秒）
+   */
   play(contextTime: number, offset: number) {
+    if (this.stopContextTime !== undefined) {
+      throw new Error("Already started.");
+    }
     this.audioBufferSourceNode.start(contextTime, offset);
     this.stopContextTime = contextTime + this.buffer.duration;
   }
 
-  stop(contextTime?: number) {
+  /**
+   * 音声の停止をスケジュールします。
+   * すでに停止がスケジュールされている場合は、
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
+   * 指定された時刻で再スケジュールを行います。
+   * @param contextTime 停止する時刻（コンテキスト時間）
+   */
+  stop(contextTime: number) {
     if (this.stopContextTime === undefined) {
       throw new Error("Not started.");
     }
-    if (contextTime === undefined || contextTime < this.stopContextTime) {
+    if (contextTime < this.stopContextTime) {
       this.audioBufferSourceNode.stop(contextTime);
-      this.stopContextTime = contextTime ?? 0;
+      this.stopContextTime = contextTime;
     }
   }
 }
@@ -441,12 +603,20 @@ export type AudioPlayerOptions = {
   readonly volume: number;
 };
 
+/**
+ * 同時に複数の音声を再生することが可能なプレイヤーです。
+ * ボイス（AudioPlayerVoice）の作成・管理を行います。
+ */
 export class AudioPlayer {
   private readonly audioContext: BaseAudioContext;
   private readonly gainNode: GainNode;
 
   private voices: AudioPlayerVoice[] = [];
 
+  get output(): AudioNode {
+    return this.gainNode;
+  }
+
   constructor(context: Context, options: AudioPlayerOptions = { volume: 1.0 }) {
     this.audioContext = context.audioContext;
 
@@ -454,35 +624,33 @@ export class AudioPlayer {
     this.gainNode.gain.value = options.volume;
   }
 
-  connect(destination: AudioNode) {
-    this.gainNode.connect(destination);
-  }
-
-  disconnect() {
-    this.gainNode.disconnect();
-  }
-
+  /**
+   * 音声の再生をスケジュールします。
+   * @param contextTime 再生を行う時刻（コンテキスト時間）
+   * @param offset オフセット（秒）
+   * @param buffer 再生する音声バッファ
+   */
   play(contextTime: number, offset: number, buffer: AudioBuffer) {
     const voice = new AudioPlayerVoice(this.audioContext, buffer);
     this.voices = this.voices.filter((value) => {
       return !value.isStopped;
     });
     this.voices.push(voice);
-    voice.connect(this.gainNode);
+    voice.output.connect(this.gainNode);
     voice.play(contextTime, offset);
   }
 
-  allStop(contextTime?: number) {
-    if (contextTime === undefined) {
-      this.voices.forEach((value) => {
-        value.stop();
-      });
-      this.voices = [];
-    } else {
-      this.voices.forEach((value) => {
-        value.stop(contextTime);
-      });
-    }
+  /**
+   * 再生中のすべての音声の停止をスケジュールします。
+   * すでに停止がスケジュールされている音声の場合は、
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
+   * 指定された時刻で再スケジュールを行います。
+   * @param contextTime 停止する時刻（コンテキスト時間）
+   */
+  allStop(contextTime: number) {
+    this.voices.forEach((value) => {
+      value.stop(contextTime);
+    });
   }
 }
 
@@ -493,12 +661,15 @@ export type Envelope = {
   readonly release: number;
 };
 
-type SynthVoiceOptions = {
+type SynthVoiceParams = {
   readonly midi: number;
   readonly oscillatorType: OscillatorType;
   readonly envelope: Envelope;
 };
 
+/**
+ * シンセサイザーのボイスです。音を合成します。
+ */
 class SynthVoice {
   readonly midi: number;
   private readonly oscillatorNode: OscillatorNode;
@@ -509,6 +680,10 @@ class SynthVoice {
   private _isStopped = false;
   private stopContextTime?: number;
 
+  get output(): AudioNode {
+    return this.gainNode;
+  }
+
   get isActive() {
     return this._isActive;
   }
@@ -517,33 +692,39 @@ class SynthVoice {
     return this._isStopped;
   }
 
-  constructor(audioContext: BaseAudioContext, options: SynthVoiceOptions) {
-    this.midi = options.midi;
-    this.envelope = options.envelope;
+  constructor(audioContext: BaseAudioContext, params: SynthVoiceParams) {
+    this.midi = params.midi;
+    this.envelope = params.envelope;
 
     this.oscillatorNode = audioContext.createOscillator();
     this.oscillatorNode.onended = () => {
       this._isStopped = true;
     };
     this.gainNode = audioContext.createGain();
-    this.oscillatorNode.type = options.oscillatorType;
+    this.oscillatorNode.type = params.oscillatorType;
     this.oscillatorNode.connect(this.gainNode);
   }
 
+  /**
+   * MIDIノート番号を周波数に変換します。
+   * @param midi MIDIノート番号
+   * @returns 周波数（Hz）
+   */
   private midiToFrequency(midi: number) {
     return 440 * 2 ** ((midi - 69) / 12);
   }
 
-  connect(destination: AudioNode) {
-    this.gainNode.connect(destination);
-  }
-
+  /**
+   * ノートオンをスケジュールします。
+   * @param contextTime ノートオンを行う時刻（コンテキスト時間）
+   */
   noteOn(contextTime: number) {
     const t0 = contextTime;
     const atk = this.envelope.attack;
     const dcy = this.envelope.decay;
     const sus = this.envelope.sustain;
 
+    // エンベロープ（アタック、ディケイ、サスティーン）のスケジュールを行う
     this.gainNode.gain.value = 0;
     this.gainNode.gain.setValueAtTime(0, t0);
     this.gainNode.gain.linearRampToValueAtTime(1, t0 + atk);
@@ -556,6 +737,13 @@ class SynthVoice {
     this._isActive = true;
   }
 
+  /**
+   * ノートオフをスケジュールします。
+   * すでにノートオフがスケジュールされている場合は、
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
+   * 指定された時刻で再スケジュールを行います。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   */
   noteOff(contextTime: number) {
     const t0 = contextTime;
     const rel = this.envelope.release;
@@ -565,6 +753,7 @@ class SynthVoice {
       this.stopContextTime === undefined ||
       stopContextTime < this.stopContextTime
     ) {
+      // エンベロープ（リリース）のスケジュールを行う
       this.gainNode.gain.cancelAndHoldAtTime(t0);
       this.gainNode.gain.setTargetAtTime(0, t0, rel);
 
@@ -574,31 +763,19 @@ class SynthVoice {
       this.stopContextTime = stopContextTime;
     }
   }
-
-  soundOff(contextTime?: number) {
-    if (
-      contextTime === undefined ||
-      this.stopContextTime === undefined ||
-      contextTime < this.stopContextTime
-    ) {
-      this.oscillatorNode.stop(contextTime);
-      this._isActive = false;
-
-      this.stopContextTime = contextTime ?? 0;
-    }
-  }
 }
 
-export type SynthOptions = {
+export type PolySynthOptions = {
   readonly volume: number;
   readonly oscillatorType: OscillatorType;
   readonly envelope: Envelope;
 };
 
 /**
- * ポリフォニックなシンセサイザー。
+ * エンベロープの設定が可能なポリフォニックシンセサイザーです。
+ * ボイス（SynthVoice）の作成・管理を行います。
  */
-export class Synth implements Instrument {
+export class PolySynth implements Instrument {
   private readonly audioContext: BaseAudioContext;
   private readonly gainNode: GainNode;
   private readonly oscillatorType: OscillatorType;
@@ -606,9 +783,13 @@ export class Synth implements Instrument {
 
   private voices: SynthVoice[] = [];
 
+  get output(): AudioNode {
+    return this.gainNode;
+  }
+
   constructor(
     context: Context,
-    options: SynthOptions = {
+    options: PolySynthOptions = {
       volume: 0.1,
       oscillatorType: "square",
       envelope: {
@@ -627,14 +808,12 @@ export class Synth implements Instrument {
     this.gainNode.gain.value = options.volume;
   }
 
-  connect(destination: AudioNode) {
-    this.gainNode.connect(destination);
-  }
-
-  disconnect() {
-    this.gainNode.disconnect();
-  }
-
+  /**
+   * ノートオンをスケジュールします。
+   * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。
+   * @param contextTime ノートオンを行う時刻（コンテキスト時間）
+   * @param midi MIDIノート番号
+   */
   noteOn(contextTime: number, midi: number) {
     const exists = this.voices.some((value) => {
       return value.isActive && value.midi === midi;
@@ -650,10 +829,16 @@ export class Synth implements Instrument {
       return !value.isStopped;
     });
     this.voices.push(voice);
-    voice.connect(this.gainNode);
+    voice.output.connect(this.gainNode);
     voice.noteOn(contextTime);
   }
 
+  /**
+   * ノートオフをスケジュールします。
+   * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   * @param midi MIDIノート番号
+   */
   noteOff(contextTime: number, midi: number) {
     const voice = this.voices.find((value) => {
       return value.isActive && value.midi === midi;
@@ -663,17 +848,17 @@ export class Synth implements Instrument {
     voice.noteOff(contextTime);
   }
 
-  allSoundOff(contextTime?: number) {
-    if (contextTime === undefined) {
-      this.voices.forEach((value) => {
-        value.soundOff();
-      });
-      this.voices = [];
-    } else {
-      this.voices.forEach((value) => {
-        value.soundOff(contextTime);
-      });
-    }
+  /**
+   * 発音中のすべての音に対して、ノートオフのスケジュールを行います。
+   * すでにノートオフがスケジュールされている音の場合は、
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
+   * 指定された時刻で再スケジュールを行います。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   */
+  allNotesOff(contextTime: number) {
+    this.voices.forEach((value) => {
+      value.noteOff(contextTime);
+    });
   }
 }
 
@@ -682,12 +867,16 @@ export type ChannelStripOptions = {
 };
 
 /**
- * ミキサーの1チャンネル分の機能を持つモジュールです。
+ * ミキサーの1チャンネル分の機能を提供します。
  */
 export class ChannelStrip {
   private readonly gainNode: GainNode;
 
-  get inputNode(): AudioNode {
+  get input(): AudioNode {
+    return this.gainNode;
+  }
+
+  get output(): AudioNode {
     return this.gainNode;
   }
 
@@ -707,14 +896,6 @@ export class ChannelStrip {
     this.gainNode = audioContext.createGain();
     this.gainNode.gain.value = options.volume;
   }
-
-  connect(destination: AudioNode) {
-    this.gainNode.connect(destination);
-  }
-
-  disconnect() {
-    this.gainNode.disconnect();
-  }
 }
 
 export type Context = {
@@ -722,6 +903,9 @@ export type Context = {
   readonly transport: BaseTransport;
 };
 
+/**
+ * 主にContextの作成・管理を行います。
+ */
 export class AudioRenderer {
   private readonly onlineContext: {
     readonly audioContext: AudioContext;
@@ -749,6 +933,11 @@ export class AudioRenderer {
     this.onlineContext = { audioContext, transport };
   }
 
+  /**
+   * 音声ファイルのBlobから音声バッファを作成します。
+   * @param blob 音声ファイルのBlob
+   * @returns 作成した音声バッファ
+   */
   async createAudioBuffer(blob: Blob) {
     const audioContext = this.onlineContext.audioContext;
     const arrayBuffer = await blob.arrayBuffer();
@@ -756,6 +945,15 @@ export class AudioRenderer {
     return audioBuffer;
   }
 
+  /**
+   * 音声をバッファーにレンダリングします。
+   * レンダリングはオフラインで行われます。
+   * @param sampleRate 音声のサンプルレート
+   * @param startTime レンダリングの開始位置（秒）
+   * @param duration 音声の長さ（秒）
+   * @param callback レンダリングの前に実行される関数
+   * @returns レンダリングした音声
+   */
   async renderToBuffer(
     sampleRate: number,
     startTime: number,
@@ -776,6 +974,9 @@ export class AudioRenderer {
     return audioBuffer;
   }
 
+  /**
+   * 破棄します。
+   */
   dispose() {
     this.onlineContext.transport.dispose();
     this.onlineContext.audioContext.close();
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 4f486e46ca..f391b4a396 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -8,7 +8,7 @@ import {
   NoteEvent,
   NoteSequence,
   Sequence,
-  Synth,
+  PolySynth,
   Transport,
 } from "@/infrastructures/AudioRenderer";
 import {
@@ -241,7 +241,8 @@ if (window.AudioContext) {
   transport = audioRenderer.transport;
   channelStrip = new ChannelStrip(audioRenderer.context);
 
-  channelStrip.connect(audioRenderer.audioContext.destination);
+  const destination = audioRenderer.audioContext.destination;
+  channelStrip.output.connect(destination);
 }
 
 let playbackPosition = 0;
@@ -1056,16 +1057,16 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               phrase.score.notes
             );
             const context = audioRendererRef.context;
-            const synth = new Synth(context);
-            synth.connect(channelStripRef.inputNode);
+            const polySynth = new PolySynth(context);
+            polySynth.output.connect(channelStripRef.input);
             const noteSequence: NoteSequence = {
               type: "note",
-              instrument: synth,
+              instrument: polySynth,
               noteEvents,
             };
             transportRef.addSequence(noteSequence);
 
-            phrase.source = synth;
+            phrase.source = polySynth;
             phrase.sequence = noteSequence;
           }
         }
@@ -1074,7 +1075,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             allPhrases.delete(hash);
             // フレーズ削除時の処理
             if (phrase.source) {
-              phrase.source.disconnect();
+              phrase.source.output.disconnect();
             }
             if (phrase.sequence) {
               transportRef.removeSequence(phrase.sequence);
@@ -1133,7 +1134,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
             // 音源とシーケンスを作成し直して、再接続する
             if (phrase.source) {
-              phrase.source.disconnect();
+              phrase.source.output.disconnect();
             }
             if (phrase.sequence) {
               transportRef.removeSequence(phrase.sequence);
@@ -1152,7 +1153,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               audioPlayer,
               audioEvents,
             };
-            audioPlayer.connect(channelStripRef.inputNode);
+            audioPlayer.output.connect(channelStripRef.input);
             transportRef.addSequence(audioSequence);
 
             phrase.source = audioPlayer;
@@ -1763,7 +1764,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
                   },
                 ];
                 const audioPlayer = new AudioPlayer(context);
-                audioPlayer.connect(channelStrip.inputNode);
+                audioPlayer.output.connect(channelStrip.input);
                 const audioSequence: AudioSequence = {
                   type: "audio",
                   audioPlayer,
@@ -1777,17 +1778,18 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
                   phrase.score.tempos,
                   phrase.score.notes
                 );
-                const synth = new Synth(context);
-                synth.connect(channelStrip.inputNode);
+                const polySynth = new PolySynth(context);
+                polySynth.output.connect(channelStrip.input);
                 const noteSequence: NoteSequence = {
                   type: "note",
-                  instrument: synth,
+                  instrument: polySynth,
                   noteEvents,
                 };
                 context.transport.addSequence(noteSequence);
               }
             }
-            channelStrip.connect(context.audioContext.destination);
+            const destination = context.audioContext.destination;
+            channelStrip.output.connect(destination);
           }
         );
         const waveFileData = convertToWavFileData(audioBuffer);

From f15ae5bd8a8dddf5409a682d33830d143d861632 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Wed, 27 Sep 2023 00:35:29 +0900
Subject: [PATCH 16/59] =?UTF-8?q?[project-s]=20main=E3=83=96=E3=83=A9?=
 =?UTF-8?q?=E3=83=B3=E3=83=81=E3=83=9E=E3=83=BC=E3=82=B8=E3=81=AE=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=83=95=E3=83=AA=E3=82=AF=E3=83=88=E8=A7=A3=E6=B6=88?=
 =?UTF-8?q?=E3=80=81=E5=8F=8A=E3=81=B3=E8=BF=BD=E5=BE=93=20(#1583)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                           | 502 ++++++++++++++------
 package.json                                |   4 -
 src/background.ts                           |  13 -
 src/components/AcceptTermsDialog.vue        |  10 -
 src/components/MinMaxCloseButtons.vue       |   8 -
 src/components/Sing/CharacterMenuButton.vue |  22 +-
 src/components/Sing/MenuBar.vue             |  31 +-
 src/components/Sing/ScoreSequencer.vue      |  19 +-
 src/components/Sing/SequencerKeys.vue       |   4 +-
 src/components/Sing/SequencerNote.vue       |  10 +-
 src/components/Sing/SingerPanel.vue         |   2 +-
 src/components/Sing/ToolBar.vue             |   8 +-
 src/plugins/ipcMessageReceiverPlugin.ts     |   5 -
 src/router/index.ts                         |  11 +-
 src/store/index.ts                          |  10 +-
 src/store/singing.ts                        |  94 ++--
 src/store/type.ts                           |  12 +-
 src/store/ui.ts                             |  10 +-
 src/type/ipc.ts                             |   5 -
 src/views/EditorHome.vue                    |  26 +-
 tests/unit/store/Vuex.spec.ts               |  14 +-
 21 files changed, 492 insertions(+), 328 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index db5651ce37..936fd735e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,14 +11,10 @@
       "dependencies": {
         "@gtm-support/vue-gtm": "1.2.3",
         "@quasar/extras": "1.10.10",
-<<<<<<< HEAD
         "@tonejs/midi": "2.0.28",
-        "ajv": "8.6.2",
-=======
         "async-lock": "1.4.0",
         "buffer": "6.0.3",
         "clone-deep": "4.0.1",
->>>>>>> main
         "core-js": "3.12.1",
         "dayjs": "1.10.7",
         "electron-log": "4.4.8",
@@ -184,6 +180,37 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/@develar/schema-utils/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@develar/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/@develar/schema-utils/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@electron/asar": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.3.tgz",
@@ -596,6 +623,22 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "13.17.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
@@ -620,6 +663,12 @@
         "node": ">= 4"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2878,22 +2927,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "devOptional": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/ajv-formats": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
@@ -2925,21 +2958,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ajv/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "devOptional": true
-    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -6089,6 +6107,28 @@
         "node": ">=8"
       }
     },
+    "node_modules/dmg-license/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "optional": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/dmg-license/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "optional": true
+    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -7118,6 +7158,22 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -7287,6 +7343,12 @@
         "node": ">= 4"
       }
     },
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/eslint/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -10094,53 +10156,11 @@
         "node": ">= 8"
       }
     },
-<<<<<<< HEAD
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/microevent.ts": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
-      "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==",
-      "dev": true
-    },
-    "node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/midi-file": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/midi-file/-/midi-file-1.2.3.tgz",
       "integrity": "sha512-JsOv9cajkVkR1gbL9Jvplz6X4lPuyVfcci0kSLzXZ2WKs7TJF72m9U5rmp45/H/1As+96dXY8xgvNLiIfGOU4w=="
     },
-=======
->>>>>>> main
     "node_modules/miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
@@ -12343,6 +12363,37 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -13050,6 +13101,40 @@
         }
       }
     },
+    "node_modules/terser-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peer": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@@ -14298,6 +14383,40 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peer": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@@ -14680,6 +14799,33 @@
       "requires": {
         "ajv": "^6.12.0",
         "ajv-keywords": "^3.4.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        }
       }
     },
     "@electron/asar": {
@@ -14985,6 +15131,18 @@
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "globals": {
           "version": "13.17.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
@@ -15000,6 +15158,12 @@
           "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
           "dev": true
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "minimatch": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -16741,26 +16905,6 @@
         "indent-string": "^4.0.0"
       }
     },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "devOptional": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "dependencies": {
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "devOptional": true
-        }
-      }
-    },
     "ajv-formats": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
@@ -16782,13 +16926,6 @@
         }
       }
     },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
-    },
     "ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -19406,6 +19543,26 @@
         "plist": "^3.0.4",
         "smart-buffer": "^4.0.2",
         "verror": "^1.10.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "optional": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "optional": true
+        }
       }
     },
     "doctrine": {
@@ -20030,6 +20187,18 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -20145,6 +20314,12 @@
           "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
           "dev": true
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "minimatch": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -22457,47 +22632,11 @@
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
-<<<<<<< HEAD
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
-    },
-    "microevent.ts": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
-      "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
     "midi-file": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/midi-file/-/midi-file-1.2.3.tgz",
       "integrity": "sha512-JsOv9cajkVkR1gbL9Jvplz6X4lPuyVfcci0kSLzXZ2WKs7TJF72m9U5rmp45/H/1As+96dXY8xgvNLiIfGOU4w=="
     },
-=======
->>>>>>> main
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
@@ -24144,6 +24283,33 @@
         "@types/json-schema": "^7.0.5",
         "ajv": "^6.12.4",
         "ajv-keywords": "^3.5.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        }
       }
     },
     "semver": {
@@ -24696,6 +24862,34 @@
         "terser": "^5.16.8"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true,
+          "peer": true
+        },
         "schema-utils": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@@ -25549,6 +25743,34 @@
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true,
+          "peer": true,
+          "requires": {}
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true,
+          "peer": true
+        },
         "schema-utils": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
diff --git a/package.json b/package.json
index bba068c11c..8e2a65e6a6 100644
--- a/package.json
+++ b/package.json
@@ -38,14 +38,10 @@
   "dependencies": {
     "@gtm-support/vue-gtm": "1.2.3",
     "@quasar/extras": "1.10.10",
-<<<<<<< HEAD
     "@tonejs/midi": "2.0.28",
-    "ajv": "8.6.2",
-=======
     "async-lock": "1.4.0",
     "buffer": "6.0.3",
     "clone-deep": "4.0.1",
->>>>>>> main
     "core-js": "3.12.1",
     "dayjs": "1.10.7",
     "electron-log": "4.4.8",
diff --git a/src/background.ts b/src/background.ts
index be3fc53267..33749fe4c7 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -467,13 +467,9 @@ async function createWindow() {
   win.on("close", (event) => {
     if (!appState.willQuit) {
       event.preventDefault();
-<<<<<<< HEAD
-      ipcMainSend(win, "PROCESS_BEFORE_QUITTING");
-=======
       ipcMainSend(win, "CHECK_EDITED_AND_NOT_SAVE", {
         closeOrReload: "close",
       });
->>>>>>> main
       return;
     }
   });
@@ -758,13 +754,8 @@ ipcMainHandle("SHOW_ERROR_DIALOG", (_, { title, message }) => {
 ipcMainHandle("SHOW_IMPORT_FILE_DIALOG", (_, { title, name, extensions }) => {
   return dialog.showOpenDialogSync(win, {
     title,
-<<<<<<< HEAD
     filters: [{ name: name ?? "Text", extensions: extensions ?? ["txt"] }],
-    properties: ["openFile", "createDirectory"],
-=======
-    filters: [{ name: "Text", extensions: ["txt"] }],
     properties: ["openFile", "createDirectory", "treatPackageAsDirectory"],
->>>>>>> main
   })?.[0];
 });
 
@@ -963,11 +954,7 @@ app.on("window-all-closed", () => {
 app.on("before-quit", async (event) => {
   if (!appState.willQuit) {
     event.preventDefault();
-<<<<<<< HEAD
-    ipcMainSend(win, "PROCESS_BEFORE_QUITTING");
-=======
     ipcMainSend(win, "CHECK_EDITED_AND_NOT_SAVE", { closeOrReload: "close" });
->>>>>>> main
     return;
   }
 
diff --git a/src/components/AcceptTermsDialog.vue b/src/components/AcceptTermsDialog.vue
index a7b9129b29..6ad2047f28 100644
--- a/src/components/AcceptTermsDialog.vue
+++ b/src/components/AcceptTermsDialog.vue
@@ -90,18 +90,8 @@ const handler = (acceptTerms: boolean) => {
     ? store.dispatch("CHECK_EDITED_AND_NOT_SAVE", { closeOrReload: "close" })
     : undefined;
 
-<<<<<<< HEAD
-    const handler = (acceptTerms: boolean) => {
-      store.dispatch("SET_ACCEPT_TERMS", {
-        acceptTerms: acceptTerms ? "Accepted" : "Rejected",
-      });
-      if (!acceptTerms) {
-        store.dispatch("PROCESS_BEFORE_QUITTING");
-      }
-=======
   modelValueComputed.value = false;
 };
->>>>>>> main
 
 const md = useMarkdownIt();
 const terms = ref("");
diff --git a/src/components/MinMaxCloseButtons.vue b/src/components/MinMaxCloseButtons.vue
index f68eb2c309..116c0994ad 100644
--- a/src/components/MinMaxCloseButtons.vue
+++ b/src/components/MinMaxCloseButtons.vue
@@ -99,19 +99,11 @@ import { useStore } from "@/store";
 
 const store = useStore();
 
-<<<<<<< HEAD
-    const closeWindow = () => {
-      store.dispatch("PROCESS_BEFORE_QUITTING");
-    };
-    const minimizeWindow = () => window.electron.minimizeWindow();
-    const maximizeWindow = () => window.electron.maximizeWindow();
-=======
 const closeWindow = async () => {
   store.dispatch("CHECK_EDITED_AND_NOT_SAVE", { closeOrReload: "close" });
 };
 const minimizeWindow = () => window.electron.minimizeWindow();
 const maximizeWindow = () => window.electron.maximizeWindow();
->>>>>>> main
 
 const isMaximized = computed(() => store.state.isMaximized);
 </script>
diff --git a/src/components/Sing/CharacterMenuButton.vue b/src/components/Sing/CharacterMenuButton.vue
index d7f2d4c31d..c76b162164 100644
--- a/src/components/Sing/CharacterMenuButton.vue
+++ b/src/components/Sing/CharacterMenuButton.vue
@@ -15,9 +15,9 @@
         >
           <q-btn-group flat class="col full-width">
             <q-btn
+              v-close-popup
               flat
               no-caps
-              v-close-popup
               class="col-grow"
               :class="
                 characterInfo.metas.speakerUuid === selectedSpeakerUuid &&
@@ -42,11 +42,11 @@
                   "
                 />
                 <q-avatar
-                  class="engine-icon"
-                  rounded
                   v-if="
                     isMultipleEngine && characterInfo.metas.styles.length < 2
                   "
+                  class="engine-icon"
+                  rounded
                 >
                   <img
                     :src="
@@ -76,20 +76,20 @@
                 <q-icon name="keyboard_arrow_right" color="grey-6" size="sm" />
 
                 <q-menu
+                  v-model="subMenuOpenFlags[characterIndex]"
                   no-parent-event
                   anchor="top end"
                   self="top start"
                   transition-show="none"
                   transition-hide="none"
                   class="character-menu"
-                  v-model="subMenuOpenFlags[characterIndex]"
                 >
                   <q-list>
                     <q-item
                       v-for="(style, styleIndex) in characterInfo.metas.styles"
                       :key="styleIndex"
-                      clickable
                       v-close-popup
+                      clickable
                       active-class="selected-character-item"
                       :active="style.styleId === selectedStyleId"
                       @click="
@@ -107,9 +107,9 @@
                           :src="characterInfo.metas.styles[styleIndex].iconPath"
                         />
                         <q-avatar
+                          v-if="isMultipleEngine"
                           rounded
                           class="engine-icon"
-                          v-if="isMultipleEngine"
                         >
                           <img
                             :src="
@@ -145,6 +145,7 @@ import { defineComponent, computed, ref } from "vue";
 import { debounce } from "quasar";
 import { useStore } from "@/store";
 import { base64ImageToUri } from "@/helpers/imageHelper";
+import { SpeakerId, StyleId } from "@/type/preload";
 
 export default defineComponent({
   name: "CharacterMenuButton",
@@ -169,7 +170,7 @@ export default defineComponent({
       subMenuOpenFlags.value = arr;
     }, 100);
 
-    const changeStyleId = (speakerUuid: string, styleId: number) => {
+    const changeStyleId = (speakerUuid: SpeakerId, styleId: StyleId) => {
       const engineId = store.state.engineIds.find((_engineId) =>
         (store.state.characterInfos[_engineId] ?? []).some(
           (characterInfo) =>
@@ -196,9 +197,14 @@ export default defineComponent({
         (x) => x.speakerUuid === speakerUuid
       )?.defaultStyleId;
 
-      return characterInfo?.metas.styles.find(
+      const defaultStyle = characterInfo?.metas.styles.find(
         (style) => style.styleId === defaultStyleId
       );
+
+      if (defaultStyle == undefined)
+        throw new Error("defaultStyle == undefined");
+
+      return defaultStyle;
     };
 
     const selectedCharacterInfo = computed(() => {
diff --git a/src/components/Sing/MenuBar.vue b/src/components/Sing/MenuBar.vue
index 0b1f83fcf6..711b3a2e2c 100644
--- a/src/components/Sing/MenuBar.vue
+++ b/src/components/Sing/MenuBar.vue
@@ -3,8 +3,8 @@
     <menu-button
       v-for="(root, index) of menudata"
       :key="index"
-      :menudata="root"
       v-model:selected="subMenuOpenFlags[index]"
+      :menudata="root"
       :disable="menubarLocked"
       @mouseover="reassignSubMenuOpen(index)"
       @mouseleave="
@@ -35,23 +35,29 @@ export type MenuItemRoot = SingMenuItemBase<"root"> & {
   onClick: () => void;
   subMenu: MenuItemData[];
   icon?: string;
+  disabled?: boolean;
+  disableWhenUiLocked: boolean;
+  disablreloadingLocked?: boolean;
 };
 
 export type MenuItemButton = SingMenuItemBase<"button"> & {
   onClick: () => void;
   icon?: string;
+  disabled?: boolean;
+  disableWhenUiLocked: boolean;
+  disablreloadingLocked?: boolean;
 };
 
 export type MenuItemCheckbox = SingMenuItemBase<"checkbox"> & {
-  checked: ComputedRef<boolean>;
   onClick: () => void;
+  checked: ComputedRef<boolean>;
+  icon?: string;
+  disabled?: boolean;
+  disableWhenUiLocked: boolean;
+  disablreloadingLocked?: boolean;
 };
 
-export type MenuItemData =
-  | MenuItemSeparator
-  | MenuItemRoot
-  | MenuItemButton
-  | MenuItemCheckbox;
+export type MenuItemData = MenuItemSeparator | MenuItemRoot | MenuItemButton;
 
 export type MenuItemType = MenuItemData["type"];
 
@@ -105,7 +111,7 @@ export default defineComponent({
     };
 
     const openHelpDialog = () => {
-      store.dispatch("IS_HELP_DIALOG_OPEN", {
+      store.dispatch("SET_DIALOG_OPEN", {
         isHelpDialogOpen: true,
       });
     };
@@ -121,6 +127,7 @@ export default defineComponent({
         onClick: () => {
           closeAllDialog();
         },
+        disableWhenUiLocked: false,
         subMenu: [
           {
             type: "button",
@@ -128,6 +135,7 @@ export default defineComponent({
             onClick: () => {
               createNewSingProject();
             },
+            disableWhenUiLocked: true,
           },
           {
             type: "button",
@@ -135,6 +143,7 @@ export default defineComponent({
             onClick: () => {
               openSingProject();
             },
+            disableWhenUiLocked: true,
           },
           {
             type: "button",
@@ -142,6 +151,7 @@ export default defineComponent({
             onClick: () => {
               saveSingProject();
             },
+            disableWhenUiLocked: true,
           },
           {
             type: "button",
@@ -149,6 +159,7 @@ export default defineComponent({
             onClick: () => {
               saveAsSingProject();
             },
+            disableWhenUiLocked: true,
           },
           { type: "separator" },
           {
@@ -157,6 +168,7 @@ export default defineComponent({
             onClick: () => {
               importMidiFile();
             },
+            disableWhenUiLocked: true,
           },
           {
             type: "button",
@@ -164,6 +176,7 @@ export default defineComponent({
             onClick: () => {
               importMusicXMLFile();
             },
+            disableWhenUiLocked: true,
           },
           { type: "separator" },
           {
@@ -172,6 +185,7 @@ export default defineComponent({
             onClick: () => {
               exportWaveFile();
             },
+            disableWhenUiLocked: true,
           },
         ],
       },
@@ -185,6 +199,7 @@ export default defineComponent({
             openHelpDialog();
           }
         },
+        disableWhenUiLocked: false,
       },
     ]);
 
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 07eb3a884e..969a2ecc37 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -1,12 +1,11 @@
 <template>
   <div
-    class="score-sequencer"
     id="score-sequencer"
+    class="score-sequencer"
     @mousedown="handleMouseDown"
     @mousemove="handleMouseMove"
     @mouseup="handleMouseUp"
     @dblclick="addNote"
-    @dblclick.prevent.stop="removeNote"
   >
     <!-- 鍵盤 -->
     <sequencer-keys />
@@ -58,11 +57,11 @@
           </pattern>
         </defs>
         <rect
+          id="sequencer-grid"
           x="0"
           y="0"
           width="100%"
           height="100%"
-          id="sequencer-grid"
           fill="url(#sequencer-grid-measure)"
         />
       </svg>
@@ -71,8 +70,8 @@
         :key="index"
         :note="note"
         :index="index"
-        :cursorX="cursorX"
-        :cursorY="cursorY"
+        :cursor-x="cursorX"
+        :cursor-y="cursorY"
         @handleNotesKeydown="handleNotesKeydown"
         @handleDragMoveStart="handleDragMoveStart"
         @handleDragRightStart="handleDragRightStart"
@@ -86,14 +85,14 @@
       max="1"
       step="0.05"
       :value="zoomX"
-      @input="setZoomX"
-      v-bind:style="{
+      :style="{
         position: 'fixed',
         zIndex: 10000,
         bottom: '8px',
         right: '16px',
         width: '80px',
       }"
+      @input="setZoomX"
     />
     <input
       type="range"
@@ -101,8 +100,7 @@
       max="1"
       step="0.05"
       :value="zoomY"
-      @input="setZoomY"
-      v-bind:style="{
+      :style="{
         position: 'fixed',
         zIndex: 10000,
         bottom: '64px',
@@ -110,14 +108,15 @@
         transform: 'rotate(-90deg)',
         width: '80px',
       }"
+      @input="setZoomY"
     />
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent, computed, ref, onMounted } from "vue";
-import { useStore } from "@/store";
 import { v4 as uuidv4 } from "uuid";
+import { useStore } from "@/store";
 import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
 import SequencerNote from "@/components/Sing/SequencerNote.vue";
 import {
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index 7e973dfdca..cdac074d39 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -15,6 +15,7 @@
         :title="y.name"
       />
       <line
+        v-if="y.pitch === 'C' || y.pitch === 'F'"
         x1="0"
         x2="48"
         :y1="`${(index + 1) * sizeY * zoomY}`"
@@ -22,13 +23,12 @@
         :class="`sequencer-keys-item-separator ${
           y.pitch === 'C' && 'sequencer-keys-item-separator-octave'
         } ${y.pitch === 'F' && 'sequencer-keys-item-separator-f'}`"
-        v-if="y.pitch === 'C' || y.pitch === 'F'"
       />
       <text
+        v-if="y.pitch === 'C'"
         font-size="10"
         x="32"
         :y="`${sizeY * zoomY * (index + 1) - 4}`"
-        v-if="y.pitch === 'C'"
         class="sequencer-keys-item-pitchname"
       >
         {{ y.name }}
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 7ae34e8757..a260c04eb6 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -9,18 +9,18 @@
     <input
       type="text"
       :value="note.lyric"
-      @input="setLyric"
       class="sequencer-note-lyric"
+      @input="setLyric"
     />
     <svg
       :height="`${barHeight}`"
       :width="`${barWidth}`"
       xmlns="http://www.w3.org/2000/svg"
       class="sequencer-note-bar"
-      @dblclick.prevent="removeNote"
-      @keydown.prevent="handleKeydown"
       focusable="true"
       tabindex="0"
+      @dblclick.prevent="removeNote"
+      @keydown.prevent="handleKeydown"
     >
       <g>
         <rect
@@ -98,7 +98,7 @@ export default defineComponent({
       store.dispatch("REMOVE_NOTE", { id: props.note.id });
     };
 
-    const setLyric = (event: InputEvent) => {
+    const setLyric = (event: Event) => {
       if (!(event.target instanceof HTMLInputElement)) {
         return;
       }
@@ -187,7 +187,7 @@ export default defineComponent({
 .sequencer-note-lyric {
   background: white;
   border: 0;
-  border-bottom: 1px solid colors.$primary-light;
+  border-bottom: 1px solid colors.$primary;
   color: colors.$display;
   font-size: 12px;
   font-weight: bold;
diff --git a/src/components/Sing/SingerPanel.vue b/src/components/Sing/SingerPanel.vue
index 16c6037ed6..ef9c1aadda 100644
--- a/src/components/Sing/SingerPanel.vue
+++ b/src/components/Sing/SingerPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sing-singer-panel" v-bind:class="{ hide: !isShowSinger }">
+  <div class="sing-singer-panel" :class="{ hide: !isShowSinger }">
     <character-menu-button class="character-menu-button" :disable="uiLocked">
       <span class="character-name">{{ characterName }}</span>
       <div class="character-portrait-wrapper">
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index c4b9765211..c65a010c5b 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -2,7 +2,7 @@
   <div class="sing-toolbar">
     <div
       class="singer-panel-toggler"
-      v-bind:class="{ active: isShowSinger }"
+      :class="{ active: isShowSinger }"
       @click="toggleShowSinger"
     >
       <img :src="selectedStyleIconPath" class="singer-avatar" />
@@ -40,7 +40,7 @@
         @update:model-value="setTempoInputBuffer"
         @change="setTempo"
       >
-        <template v-slot:prepend>
+        <template #prepend>
           <div />
         </template>
       </q-input>
@@ -53,7 +53,7 @@
         @update:model-value="setBeatsInputBuffer"
         @change="setTimeSignature"
       >
-        <template v-slot:prepend>
+        <template #prepend>
           <div />
         </template>
       </q-input>
@@ -67,7 +67,7 @@
         @update:model-value="setBeatTypeInputBuffer"
         @change="setTimeSignature"
       >
-        <template v-slot:prepend>
+        <template #prepend>
           <div />
         </template>
       </q-input>
diff --git a/src/plugins/ipcMessageReceiverPlugin.ts b/src/plugins/ipcMessageReceiverPlugin.ts
index 356608415d..27224113cd 100644
--- a/src/plugins/ipcMessageReceiverPlugin.ts
+++ b/src/plugins/ipcMessageReceiverPlugin.ts
@@ -44,13 +44,8 @@ export const ipcMessageReceiver: Plugin = {
       options.store.dispatch("DETECT_LEAVE_FULLSCREEN")
     );
 
-<<<<<<< HEAD
-    window.electron.onReceivedIPCMsg("PROCESS_BEFORE_QUITTING", () => {
-      options.store.dispatch("PROCESS_BEFORE_QUITTING");
-=======
     window.electron.onReceivedIPCMsg("CHECK_EDITED_AND_NOT_SAVE", (_, obj) => {
       options.store.dispatch("CHECK_EDITED_AND_NOT_SAVE", obj);
->>>>>>> main
     });
 
     window.electron.onReceivedIPCMsg(
diff --git a/src/router/index.ts b/src/router/index.ts
index f121e3b0cb..0993e305bb 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,14 +1,5 @@
-<<<<<<< HEAD
-import {
-  createRouter,
-  createWebHistory,
-  createWebHashHistory,
-  RouteRecordRaw,
-} from "vue-router";
-import SingerHome from "../views/SingerHome.vue";
-=======
 import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
->>>>>>> main
+import SingerHome from "../views/SingerHome.vue";
 import EditorHome from "../views/EditorHome.vue";
 
 const routes: Array<RouteRecordRaw> = [
diff --git a/src/store/index.ts b/src/store/index.ts
index b4b8823107..30848ebccc 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -17,11 +17,8 @@ import {
   audioCommandStoreState,
   getCharacterInfo,
 } from "./audio";
-<<<<<<< HEAD
-import { singingStoreState, singingStore } from "./singing";
-=======
 import { audioPlayerStoreState, audioPlayerStore } from "./audioPlayer";
->>>>>>> main
+import { singingStoreState, singingStore } from "./singing";
 import { projectStoreState, projectStore } from "./project";
 import { uiStoreState, uiStore } from "./ui";
 import { settingStoreState, settingStore } from "./setting";
@@ -354,11 +351,8 @@ export const store = createStore<State, AllGetters, AllActions, AllMutations>({
   state: {
     ...uiStoreState,
     ...audioStoreState,
-<<<<<<< HEAD
-    ...singingStoreState,
-=======
     ...audioPlayerStoreState,
->>>>>>> main
+    ...singingStoreState,
     ...commandStoreState,
     ...engineStoreState,
     ...projectStoreState,
diff --git a/src/store/singing.ts b/src/store/singing.ts
index f391b4a396..09d4e45ce9 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,3 +1,17 @@
+import path from "path";
+import { Midi } from "@tonejs/midi";
+import { v4 as uuidv4 } from "uuid";
+import {
+  Score,
+  Tempo,
+  TimeSignature,
+  Note,
+  SingingStoreState,
+  SingingStoreTypes,
+  SaveResultObject,
+} from "./type";
+import { createPartialStore } from "./vuex";
+import { createUILockAction } from "./ui";
 import {
   AudioEvent,
   AudioPlayer,
@@ -11,27 +25,14 @@ import {
   PolySynth,
   Transport,
 } from "@/infrastructures/AudioRenderer";
-import {
-  Score,
-  Tempo,
-  TimeSignature,
-  Note,
-  SingingStoreState,
-  SingingStoreTypes,
-  SaveResultObject,
-} from "./type";
-import path from "path";
-import { createPartialStore } from "./vuex";
-import { createUILockAction } from "./ui";
-import { WriteFileErrorResult } from "@/type/preload";
-import { Midi } from "@tonejs/midi";
+import { EngineId, StyleId } from "@/type/preload";
 import {
   getDoremiFromMidi,
   midiToFrequency,
   round,
 } from "@/helpers/singHelper";
 import { AudioQuery } from "@/openapi";
-import { v4 as uuidv4 } from "uuid";
+import { ResultError, getValueOrThrow } from "@/type/result";
 
 const ticksToSecondsForConstantBpm = (
   resolution: number,
@@ -160,8 +161,8 @@ const createPromiseThatResolvesWhen = (
 };
 
 type Singer = {
-  readonly engineId: string;
-  readonly styleId: number;
+  readonly engineId: EngineId;
+  readonly styleId: StyleId;
 };
 
 type Phrase = {
@@ -287,7 +288,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   SET_SINGER: {
     mutation(
       state,
-      { engineId, styleId }: { engineId: string; styleId: number }
+      { engineId, styleId }: { engineId: EngineId; styleId: StyleId }
     ) {
       state.engineId = engineId;
       state.styleId = styleId;
@@ -1238,7 +1239,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           if (!filePath) return;
         }
 
-        const midiData = await window.electron.readFile({ filePath });
+        const midiData = getValueOrThrow(
+          await window.electron.readFile({ filePath })
+        );
         const midi = new Midi(midiData);
 
         const score = await dispatch("GET_EMPTY_SCORE");
@@ -1336,11 +1339,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         }
 
         let xmlStr = new TextDecoder("utf-8").decode(
-          await window.electron.readFile({ filePath })
+          getValueOrThrow(await window.electron.readFile({ filePath }))
         );
         if (xmlStr.indexOf("\ufffd") > -1) {
           xmlStr = new TextDecoder("shift-jis").decode(
-            await window.electron.readFile({ filePath })
+            getValueOrThrow(await window.electron.readFile({ filePath }))
           );
         }
 
@@ -1684,20 +1687,25 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return buffer;
         };
 
-        const generateWriteErrorMessage = (
-          writeFileErrorResult: WriteFileErrorResult
-        ) => {
-          if (writeFileErrorResult.code) {
-            const code = writeFileErrorResult.code.toUpperCase();
+        function generateWriteErrorMessage(writeFileResult: ResultError) {
+          if (writeFileResult.code) {
+            const code = writeFileResult.code.toUpperCase();
+
             if (code.startsWith("ENOSPC")) {
               return "空き容量が足りません。";
             }
+
             if (code.startsWith("EACCES")) {
               return "ファイルにアクセスする許可がありません。";
             }
+
+            if (code.startsWith("EBUSY")) {
+              return "ファイルが開かれています。";
+            }
           }
-          return `何らかの理由で失敗しました。${writeFileErrorResult.message}`;
-        };
+
+          return `何らかの理由で失敗しました。${writeFileResult.message}`;
+        }
 
         if (!audioRenderer) {
           throw new Error("audioRenderer is undefined.");
@@ -1739,7 +1747,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         if (state.savingSetting.avoidOverwrite) {
           let tail = 1;
           const name = filePath.slice(0, filePath.length - 4);
-          while (await dispatch("CHECK_FILE_EXISTS", { file: filePath })) {
+          while (await window.electron.checkFileExists(filePath)) {
             filePath = name + "[" + tail.toString() + "]" + ".wav";
             tail += 1;
           }
@@ -1794,16 +1802,28 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         );
         const waveFileData = convertToWavFileData(audioBuffer);
 
-        const writeFileResult = window.electron.writeFile({
-          filePath,
-          buffer: waveFileData,
-        }); // 失敗した場合、WriteFileErrorResultオブジェクトが返り、成功時はundefinedが反る
-        if (writeFileResult) {
-          window.electron.logError(new Error(writeFileResult.message));
+        try {
+          await window.electron
+            .writeFile({
+              filePath,
+              buffer: waveFileData,
+            })
+            .then(getValueOrThrow);
+        } catch (e) {
+          window.electron.logError(e);
+          if (e instanceof ResultError) {
+            return {
+              result: "WRITE_ERROR",
+              path: filePath,
+              errorMessage: generateWriteErrorMessage(e),
+            };
+          }
           return {
-            result: "WRITE_ERROR",
+            result: "UNKNOWN_ERROR",
             path: filePath,
-            errorMessage: generateWriteErrorMessage(writeFileResult),
+            errorMessage:
+              (e instanceof Error ? e.message : String(e)) ||
+              "不明なエラーが発生しました。",
           };
         }
 
diff --git a/src/store/type.ts b/src/store/type.ts
index fe93fd5776..d6c0a32049 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -741,8 +741,8 @@ export type AudioPlayerStoreTypes = {
  */
 
 export type SingingStoreState = {
-  engineId?: string;
-  styleId?: number;
+  engineId?: EngineId;
+  styleId?: StyleId;
   score?: Score;
   // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
   isShowSinger: boolean;
@@ -770,8 +770,8 @@ export type SingingStoreTypes = {
   };
 
   SET_SINGER: {
-    mutation: { engineId: string; styleId: number };
-    action(payload: { engineId?: string; styleId?: number }): void;
+    mutation: { engineId: EngineId; styleId: StyleId };
+    action(payload: { engineId?: EngineId; styleId?: StyleId }): void;
   };
 
   GET_EMPTY_SCORE: {
@@ -1591,10 +1591,6 @@ export type UiStoreTypes = {
   RESET_PROGRESS: {
     action(): void;
   };
-
-  PROCESS_BEFORE_QUITTING: {
-    action(): Promise<void>;
-  };
 };
 
 /*
diff --git a/src/store/ui.ts b/src/store/ui.ts
index a72df358aa..a4f666fec1 100644
--- a/src/store/ui.ts
+++ b/src/store/ui.ts
@@ -375,20 +375,16 @@ export const uiStore = createPartialStore<UiStoreTypes>({
      * 保存がキャンセルされた場合は何もしない。
      */
     async action({ dispatch, getters }, obj) {
+      await dispatch("SING_STOP_AUDIO"); // FIXME: ON_BEFORE_QUITTINGなどを作成して移動すべき
+
       if (getters.IS_EDITED) {
         const result = await dispatch("SAVE_OR_DISCARD_PROJECT_FILE", {});
         if (result == "canceled") {
           return;
         }
       }
-    },
-  },
 
-  PROCESS_BEFORE_QUITTING: {
-    async action({ dispatch }) {
-      await dispatch("SING_STOP_AUDIO");
-      await dispatch("CHECK_EDITED_AND_NOT_SAVE");
-      await dispatch("STOP_RENDERING");
+      await dispatch("STOP_RENDERING"); // FIXME: FINISH_VUEXなどを作成して移動すべき
 
       if (obj.closeOrReload == "close") {
         window.electron.closeWindow();
diff --git a/src/type/ipc.ts b/src/type/ipc.ts
index a880d05377..17722a25f8 100644
--- a/src/type/ipc.ts
+++ b/src/type/ipc.ts
@@ -347,10 +347,6 @@ export type IpcSOData = {
     return: void;
   };
 
-<<<<<<< HEAD
-  PROCESS_BEFORE_QUITTING: {
-    args: [];
-=======
   CHECK_EDITED_AND_NOT_SAVE: {
     args: [
       obj: {
@@ -358,7 +354,6 @@ export type IpcSOData = {
         isMultiEngineOffMode?: boolean;
       }
     ];
->>>>>>> main
     return: void;
   };
 
diff --git a/src/views/EditorHome.vue b/src/views/EditorHome.vue
index 219409f557..3dbccab41e 100644
--- a/src/views/EditorHome.vue
+++ b/src/views/EditorHome.vue
@@ -194,12 +194,9 @@ import CharacterOrderDialog from "@/components/CharacterOrderDialog.vue";
 import AcceptRetrieveTelemetryDialog from "@/components/AcceptRetrieveTelemetryDialog.vue";
 import AcceptTermsDialog from "@/components/AcceptTermsDialog.vue";
 import DictionaryManageDialog from "@/components/DictionaryManageDialog.vue";
-<<<<<<< HEAD
-import SingerTab from "@/components/SingerTab.vue";
-=======
 import EngineManageDialog from "@/components/EngineManageDialog.vue";
 import ProgressDialog from "@/components/ProgressDialog.vue";
->>>>>>> main
+import SingerTab from "@/components/SingerTab.vue";
 import { AudioItem, EngineState } from "@/store/type";
 import {
   AudioKey,
@@ -218,26 +215,6 @@ const props =
     projectFilePath: string;
   }>();
 
-<<<<<<< HEAD
-  components: {
-    draggable,
-    MenuBar,
-    HeaderBar,
-    AudioCell,
-    AudioDetail,
-    AudioInfo,
-    HelpDialog,
-    SettingDialog,
-    HotkeySettingDialog,
-    HeaderBarCustomDialog,
-    CharacterPortrait,
-    DefaultStyleSelectDialog,
-    CharacterOrderDialog,
-    AcceptRetrieveTelemetryDialog,
-    AcceptTermsDialog,
-    DictionaryManageDialog,
-    SingerTab,
-=======
 const store = useStore();
 
 const audioKeys = computed(() => store.state.audioKeys);
@@ -297,7 +274,6 @@ const hotkeyActionsNative = [
       addAudioItem();
       event.preventDefault();
     }
->>>>>>> main
   },
   (event: KeyboardEvent) => {
     if (
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index f160372b85..b0f7d8fd87 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -12,12 +12,9 @@ import { settingStore } from "@/store/setting";
 import { presetStore } from "@/store/preset";
 import { proxyStore } from "@/store/proxy";
 import { dictionaryStore } from "@/store/dictionary";
-<<<<<<< HEAD
-import { singingStore } from "@/store/singing";
-=======
 import { engineStore } from "@/store/engine";
+import { singingStore } from "@/store/singing";
 import { EngineId } from "@/type/preload";
->>>>>>> main
 const isDevelopment = process.env.NODE_ENV == "development";
 // TODO: Swap external files to Mock
 
@@ -148,7 +145,9 @@ describe("store/vuex.js test", () => {
           engineStartedOnAltPort: false,
           notifyOnGenerate: false,
         },
-<<<<<<< HEAD
+        progress: -1,
+        isVuexReady: false,
+        defaultPresetKeys: {},
         isShowSinger: true,
         sequencerZoomX: 1,
         sequencerZoomY: 1,
@@ -164,11 +163,6 @@ describe("store/vuex.js test", () => {
         startRenderingRequested: false,
         stopRenderingRequested: false,
         nowRendering: false,
-=======
-        progress: -1,
-        isVuexReady: false,
-        defaultPresetKeys: {},
->>>>>>> main
       },
       getters: {
         ...uiStore.getters,

From 17557ce8644951c386ac505b2e0f3ede6700bbd4 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 28 Sep 2023 02:20:55 +0900
Subject: [PATCH 17/59] =?UTF-8?q?[project-s]=20=E9=9F=B3=E5=A3=B0=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=A8=E3=83=88?=
 =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=82=B9=E3=83=9D=E3=83=BC=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=B1=E3=81=86=E5=BD=A2=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=80=81=E9=9F=B3=E5=A3=B0=E3=82=92Blob=E3=81=A7?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20(#1590)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/infrastructures/AudioRenderer.ts | 124 ++------------------
 src/store/singing.ts                 | 162 ++++++++++++++-------------
 2 files changed, 96 insertions(+), 190 deletions(-)

diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 0b040fa536..bc9b8dba2c 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -66,28 +66,11 @@ interface EventScheduler {
   stop(contextTime: number): void;
 }
 
-/**
- * 複数のシーケンスのスケジューリングを行うトランスポートを表します。
- */
-export interface BaseTransport {
-  /**
-   * シーケンスを追加します。
-   * @param sequence 追加するシーケンス
-   */
-  addSequence(sequence: Sequence): void;
-
-  /**
-   * シーケンスを削除します。
-   * @param sequence 削除するシーケンス
-   */
-  removeSequence(sequence: Sequence): void;
-}
-
 /**
  * 複数のシーケンスのスケジューリングを行います。
  * 再生、停止、再生位置の変更などの機能を提供します。
  */
-export class Transport implements BaseTransport {
+export class Transport {
   private readonly audioContext: AudioContext;
   private readonly timer: Timer;
   private readonly scheduleAheadTime: number;
@@ -134,8 +117,8 @@ export class Transport implements BaseTransport {
    */
   constructor(
     audioContext: AudioContext,
-    lookahead: number,
-    scheduleAheadTime: number
+    lookahead = 0.2,
+    scheduleAheadTime = 0.6
   ) {
     if (scheduleAheadTime <= lookahead) {
       throw new Error(
@@ -275,7 +258,7 @@ export class Transport implements BaseTransport {
  * 複数のシーケンスのスケジューリングを行います。
  * オフラインレンダリングで使用します。
  */
-export class OfflineTransport implements BaseTransport {
+export class OfflineTransport {
   private schedulers = new Map<Sequence, EventScheduler>();
 
   /**
@@ -617,8 +600,11 @@ export class AudioPlayer {
     return this.gainNode;
   }
 
-  constructor(context: Context, options: AudioPlayerOptions = { volume: 1.0 }) {
-    this.audioContext = context.audioContext;
+  constructor(
+    audioContext: BaseAudioContext,
+    options: AudioPlayerOptions = { volume: 1.0 }
+  ) {
+    this.audioContext = audioContext;
 
     this.gainNode = this.audioContext.createGain();
     this.gainNode.gain.value = options.volume;
@@ -788,7 +774,7 @@ export class PolySynth implements Instrument {
   }
 
   constructor(
-    context: Context,
+    audioContext: BaseAudioContext,
     options: PolySynthOptions = {
       volume: 0.1,
       oscillatorType: "square",
@@ -800,7 +786,7 @@ export class PolySynth implements Instrument {
       },
     }
   ) {
-    this.audioContext = context.audioContext;
+    this.audioContext = audioContext;
 
     this.oscillatorType = options.oscillatorType;
     this.envelope = options.envelope;
@@ -889,96 +875,10 @@ export class ChannelStrip {
   }
 
   constructor(
-    context: Context,
+    audioContext: BaseAudioContext,
     options: ChannelStripOptions = { volume: 0.1 }
   ) {
-    const audioContext = context.audioContext;
     this.gainNode = audioContext.createGain();
     this.gainNode.gain.value = options.volume;
   }
 }
-
-export type Context = {
-  readonly audioContext: BaseAudioContext;
-  readonly transport: BaseTransport;
-};
-
-/**
- * 主にContextの作成・管理を行います。
- */
-export class AudioRenderer {
-  private readonly onlineContext: {
-    readonly audioContext: AudioContext;
-    readonly transport: Transport;
-  };
-
-  get context(): Context {
-    return {
-      audioContext: this.onlineContext.audioContext,
-      transport: this.onlineContext.transport,
-    };
-  }
-
-  get audioContext() {
-    return this.onlineContext.audioContext;
-  }
-
-  get transport() {
-    return this.onlineContext.transport;
-  }
-
-  constructor() {
-    const audioContext = new AudioContext();
-    const transport = new Transport(audioContext, 0.2, 0.6);
-    this.onlineContext = { audioContext, transport };
-  }
-
-  /**
-   * 音声ファイルのBlobから音声バッファを作成します。
-   * @param blob 音声ファイルのBlob
-   * @returns 作成した音声バッファ
-   */
-  async createAudioBuffer(blob: Blob) {
-    const audioContext = this.onlineContext.audioContext;
-    const arrayBuffer = await blob.arrayBuffer();
-    const audioBuffer = await audioContext.decodeAudioData(arrayBuffer);
-    return audioBuffer;
-  }
-
-  /**
-   * 音声をバッファーにレンダリングします。
-   * レンダリングはオフラインで行われます。
-   * @param sampleRate 音声のサンプルレート
-   * @param startTime レンダリングの開始位置（秒）
-   * @param duration 音声の長さ（秒）
-   * @param callback レンダリングの前に実行される関数
-   * @returns レンダリングした音声
-   */
-  async renderToBuffer(
-    sampleRate: number,
-    startTime: number,
-    duration: number,
-    callback: (context: Context) => void
-  ) {
-    if (this.onlineContext.transport.state === "started") {
-      this.onlineContext.transport.stop();
-    }
-
-    const length = sampleRate * duration;
-    const audioContext = new OfflineAudioContext(2, length, sampleRate);
-    const transport = new OfflineTransport();
-
-    callback({ audioContext, transport });
-    transport.schedule(startTime, duration);
-    const audioBuffer = await audioContext.startRendering();
-    return audioBuffer;
-  }
-
-  /**
-   * 破棄します。
-   */
-  dispose() {
-    this.onlineContext.transport.dispose();
-    this.onlineContext.audioContext.close();
-  }
-}
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 09d4e45ce9..ab80e17eb9 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -15,7 +15,6 @@ import { createUILockAction } from "./ui";
 import {
   AudioEvent,
   AudioPlayer,
-  AudioRenderer,
   AudioSequence,
   ChannelStrip,
   Instrument,
@@ -24,6 +23,7 @@ import {
   Sequence,
   PolySynth,
   Transport,
+  OfflineTransport,
 } from "@/infrastructures/AudioRenderer";
 import { EngineId, StyleId } from "@/type/preload";
 import {
@@ -111,6 +111,16 @@ const secondsToTicks = (
   );
 };
 
+const generateAudioEvents = async (
+  audioContext: BaseAudioContext,
+  time: number,
+  blob: Blob
+): Promise<AudioEvent[]> => {
+  const arrayBuffer = await blob.arrayBuffer();
+  const buffer = await audioContext.decodeAudioData(arrayBuffer);
+  return [{ time, buffer }];
+};
+
 const generateNoteEvents = (
   resolution: number,
   tempos: Tempo[],
@@ -171,7 +181,7 @@ type Phrase = {
   // renderingが進むに連れてデータが代入されていく
   query?: AudioQuery;
   queryHash?: string; // queryの変更を検知するためのハッシュ
-  buffer?: AudioBuffer;
+  blob?: Blob;
   startTime?: number;
   source?: Instrument | AudioPlayer; // ひとまずPhraseに持たせる
   sequence?: Sequence; // ひとまずPhraseに持たせる
@@ -232,24 +242,22 @@ const DEFAULT_TEMPO = 120;
 const DEFAULT_BEATS = 4;
 const DEFAULT_BEAT_TYPE = 4;
 
-let audioRenderer: AudioRenderer | undefined;
+let audioContext: AudioContext | undefined;
 let transport: Transport | undefined;
 let channelStrip: ChannelStrip | undefined;
 
-// テスト時はAudioContextが存在しないのでAudioRendererを作らない
+// NOTE: テスト時はAudioContextが存在しない
 if (window.AudioContext) {
-  audioRenderer = new AudioRenderer();
-  transport = audioRenderer.transport;
-  channelStrip = new ChannelStrip(audioRenderer.context);
+  audioContext = new AudioContext();
+  transport = new Transport(audioContext);
+  channelStrip = new ChannelStrip(audioContext);
 
-  const destination = audioRenderer.audioContext.destination;
-  channelStrip.output.connect(destination);
+  channelStrip.output.connect(audioContext.destination);
 }
 
 let playbackPosition = 0;
 const allPhrases = new Map<string, Phrase>();
-
-const audioBufferCache = new Map<string, AudioBuffer>();
+const phraseAudioBlobCache = new Map<string, Blob>();
 
 export const singingStoreState: SingingStoreState = {
   engineId: undefined,
@@ -1028,12 +1036,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       const stopRenderingRequested = () => state.stopRenderingRequested;
 
       const render = async () => {
-        if (!state.score || !audioRenderer || !transport || !channelStrip) {
+        if (!state.score || !audioContext || !transport || !channelStrip) {
           throw new Error(
-            "score or audioRenderer or transport or channelStrip is undefined."
+            "score or audioContext or transport or channelStrip is undefined."
           );
         }
-        const audioRendererRef = audioRenderer;
+        const audioContextRef = audioContext;
         const transportRef = transport;
         const channelStripRef = channelStrip;
 
@@ -1057,8 +1065,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               phrase.score.tempos,
               phrase.score.notes
             );
-            const context = audioRendererRef.context;
-            const polySynth = new PolySynth(context);
+            const polySynth = new PolySynth(audioContextRef);
             polySynth.output.connect(channelStripRef.input);
             const noteSequence: NoteSequence = {
               type: "note",
@@ -1112,21 +1119,20 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             return;
           }
 
-          // AudioQuery -> AudioBuffer
+          // AudioQuery -> Blob
           // Phrase & AudioQuery -> startTime
 
           const queryHash = await generateAudioQueryHash(phrase.query);
           // クエリが変更されていたら再合成
           if (queryHash !== phrase.queryHash) {
-            phrase.buffer = audioBufferCache.get(queryHash);
-            if (phrase.buffer) {
+            phrase.blob = phraseAudioBlobCache.get(queryHash);
+            if (phrase.blob) {
               window.electron.logInfo(`Loaded audio buffer from cache.`);
             } else {
               window.electron.logInfo(`Synthesizing...`);
 
-              const blob = await synthesize(phrase.singer, phrase.query);
-              phrase.buffer = await audioRendererRef.createAudioBuffer(blob);
-              audioBufferCache.set(queryHash, phrase.buffer);
+              phrase.blob = await synthesize(phrase.singer, phrase.query);
+              phraseAudioBlobCache.set(queryHash, phrase.blob);
 
               window.electron.logInfo(`Synthesized.`);
             }
@@ -1141,14 +1147,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               transportRef.removeSequence(phrase.sequence);
             }
 
-            const context = audioRendererRef.context;
-            const audioPlayer = new AudioPlayer(context);
-            const audioEvents: AudioEvent[] = [
-              {
-                time: phrase.startTime,
-                buffer: phrase.buffer,
-              },
-            ];
+            const audioPlayer = new AudioPlayer(audioContextRef);
+            const audioEvents = await generateAudioEvents(
+              audioContextRef,
+              phrase.startTime,
+              phrase.blob
+            );
             const audioSequence: AudioSequence = {
               type: "audio",
               audioPlayer,
@@ -1707,8 +1711,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return `何らかの理由で失敗しました。${writeFileResult.message}`;
         }
 
-        if (!audioRenderer) {
-          throw new Error("audioRenderer is undefined.");
+        if (!window.OfflineAudioContext) {
+          throw new Error("OfflineAudioContext is undefined.");
         }
 
         // TODO: ファイル名を設定できるようにする
@@ -1753,53 +1757,55 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           }
         }
 
-        // TODO: レンダリングで使用したノードはdisconnectしなくても解放されるはずですが、
-        // 念のため歌声合成周りを実装後に確認した方が良いかも
-        const audioBuffer = await audioRenderer.renderToBuffer(
-          48000, // TODO: 設定できるようにする
-          renderStartTime,
-          renderDuration,
-          (context) => {
-            const channelStrip = new ChannelStrip(context);
-            for (const phrase of allPhrases.values()) {
-              // TODO: この辺りの処理を共通化する
-              if (phrase.startTime !== undefined && phrase.buffer) {
-                // レンダリング済みのフレーズの場合
-                const audioEvents: AudioEvent[] = [
-                  {
-                    time: phrase.startTime,
-                    buffer: phrase.buffer,
-                  },
-                ];
-                const audioPlayer = new AudioPlayer(context);
-                audioPlayer.output.connect(channelStrip.input);
-                const audioSequence: AudioSequence = {
-                  type: "audio",
-                  audioPlayer,
-                  audioEvents,
-                };
-                context.transport.addSequence(audioSequence);
-              } else {
-                // レンダリング未完了のフレーズの場合
-                const noteEvents = generateNoteEvents(
-                  phrase.score.resolution,
-                  phrase.score.tempos,
-                  phrase.score.notes
-                );
-                const polySynth = new PolySynth(context);
-                polySynth.output.connect(channelStrip.input);
-                const noteSequence: NoteSequence = {
-                  type: "note",
-                  instrument: polySynth,
-                  noteEvents,
-                };
-                context.transport.addSequence(noteSequence);
-              }
-            }
-            const destination = context.audioContext.destination;
-            channelStrip.output.connect(destination);
-          }
+        const sampleRate = 48000; // TODO: 設定できるようにする
+        const offlineAudioContext = new OfflineAudioContext(
+          2,
+          sampleRate * renderDuration,
+          sampleRate
         );
+        const offlineTransport = new OfflineTransport();
+        const channelStrip = new ChannelStrip(offlineAudioContext);
+
+        for (const phrase of allPhrases.values()) {
+          // TODO: この辺りの処理を共通化する
+          if (phrase.startTime !== undefined && phrase.blob) {
+            // レンダリング済みのフレーズの場合
+            const audioEvents = await generateAudioEvents(
+              offlineAudioContext,
+              phrase.startTime,
+              phrase.blob
+            );
+            const audioPlayer = new AudioPlayer(offlineAudioContext);
+            audioPlayer.output.connect(channelStrip.input);
+            const audioSequence: AudioSequence = {
+              type: "audio",
+              audioPlayer,
+              audioEvents,
+            };
+            offlineTransport.addSequence(audioSequence);
+          } else {
+            // レンダリング未完了のフレーズの場合
+            const noteEvents = generateNoteEvents(
+              phrase.score.resolution,
+              phrase.score.tempos,
+              phrase.score.notes
+            );
+            const polySynth = new PolySynth(offlineAudioContext);
+            polySynth.output.connect(channelStrip.input);
+            const noteSequence: NoteSequence = {
+              type: "note",
+              instrument: polySynth,
+              noteEvents,
+            };
+            offlineTransport.addSequence(noteSequence);
+          }
+        }
+        channelStrip.output.connect(offlineAudioContext.destination);
+
+        // スケジューリングを行い、オフラインレンダリングを実行
+        // TODO: オフラインレンダリング後にメモリーがきちんと開放されるか確認する
+        offlineTransport.schedule(renderStartTime, renderDuration);
+        const audioBuffer = await offlineAudioContext.startRendering();
         const waveFileData = convertToWavFileData(audioBuffer);
 
         try {

From 7a94cb45bf72e79fb46ed97daa1e486997ca21c4 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 1 Oct 2023 02:45:49 +0900
Subject: [PATCH 18/59] =?UTF-8?q?[project-s]=20=E5=87=BA=E5=8A=9B=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E9=9F=B3=E5=A3=B0=E3=81=8C0dB=E3=82=92=E8=B6=85?=
 =?UTF-8?q?=E3=81=88=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=20(#1593)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/infrastructures/AudioRenderer.ts | 141 +++++++++++++++++++++++++--
 src/store/singing.ts                 |  28 +++++-
 2 files changed, 157 insertions(+), 12 deletions(-)

diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index bc9b8dba2c..eeb5f07c8b 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -99,7 +99,6 @@ export class Transport {
     }
     return this._time;
   }
-
   set time(value: number) {
     if (this._state === "started") {
       this.stop();
@@ -542,7 +541,7 @@ class AudioPlayerVoice {
   }
 
   constructor(audioContext: BaseAudioContext, buffer: AudioBuffer) {
-    this.audioBufferSourceNode = audioContext.createBufferSource();
+    this.audioBufferSourceNode = new AudioBufferSourceNode(audioContext);
     this.audioBufferSourceNode.buffer = buffer;
     this.audioBufferSourceNode.onended = () => {
       this._isStopped = true;
@@ -606,7 +605,7 @@ export class AudioPlayer {
   ) {
     this.audioContext = audioContext;
 
-    this.gainNode = this.audioContext.createGain();
+    this.gainNode = new GainNode(audioContext);
     this.gainNode.gain.value = options.volume;
   }
 
@@ -682,11 +681,11 @@ class SynthVoice {
     this.midi = params.midi;
     this.envelope = params.envelope;
 
-    this.oscillatorNode = audioContext.createOscillator();
+    this.oscillatorNode = new OscillatorNode(audioContext);
     this.oscillatorNode.onended = () => {
       this._isStopped = true;
     };
-    this.gainNode = audioContext.createGain();
+    this.gainNode = new GainNode(audioContext);
     this.oscillatorNode.type = params.oscillatorType;
     this.oscillatorNode.connect(this.gainNode);
   }
@@ -790,7 +789,7 @@ export class PolySynth implements Instrument {
 
     this.oscillatorType = options.oscillatorType;
     this.envelope = options.envelope;
-    this.gainNode = this.audioContext.createGain();
+    this.gainNode = new GainNode(this.audioContext);
     this.gainNode.gain.value = options.volume;
   }
 
@@ -869,7 +868,6 @@ export class ChannelStrip {
   get volume() {
     return this.gainNode.gain.value;
   }
-
   set volume(value: number) {
     this.gainNode.gain.value = value;
   }
@@ -878,7 +876,134 @@ export class ChannelStrip {
     audioContext: BaseAudioContext,
     options: ChannelStripOptions = { volume: 0.1 }
   ) {
-    this.gainNode = audioContext.createGain();
+    this.gainNode = new GainNode(audioContext);
     this.gainNode.gain.value = options.volume;
   }
 }
+
+export type LimiterOptions = {
+  readonly inputGain: number;
+  readonly outputGain: number;
+  readonly release: number;
+};
+
+/**
+ * リミッターです。大きい音を抑えます。
+ */
+export class Limiter {
+  private readonly inputGainNode: GainNode;
+  private readonly compNode: DynamicsCompressorNode;
+  private readonly correctionGainNode: GainNode;
+  private readonly outputGainNode: GainNode;
+
+  get input(): AudioNode {
+    return this.inputGainNode;
+  }
+
+  get output(): AudioNode {
+    return this.outputGainNode;
+  }
+
+  /**
+   * 入力ゲイン（dB）
+   */
+  get inputGain() {
+    return this.getGainInDecibels(this.inputGainNode);
+  }
+  set inputGain(value: number) {
+    this.setGainInDecibels(value, this.inputGainNode);
+  }
+
+  /**
+   * 出力ゲイン（dB）
+   */
+  get outputGain() {
+    return this.getGainInDecibels(this.outputGainNode);
+  }
+  set outputGain(value: number) {
+    this.setGainInDecibels(value, this.outputGainNode);
+  }
+
+  get release() {
+    return this.compNode.release.value;
+  }
+  set release(value: number) {
+    this.compNode.release.value = value;
+  }
+
+  get reduction() {
+    return this.compNode.reduction;
+  }
+
+  constructor(
+    audioContext: BaseAudioContext,
+    options: LimiterOptions = { inputGain: 0, outputGain: 0, release: 0.25 }
+  ) {
+    this.inputGainNode = new GainNode(audioContext);
+    this.compNode = new DynamicsCompressorNode(audioContext);
+    this.correctionGainNode = new GainNode(audioContext);
+    this.outputGainNode = new GainNode(audioContext);
+
+    // TODO: 伴奏を再生する機能を実装したら、パラメーターを再調整する
+    this.compNode.threshold.value = -5; // 0dBを超えそうになったら（-5dBを超えたら）圧縮する
+    this.compNode.ratio.value = 20; // クリッピングが起こらないように、高いレシオ（1/20）で圧縮する
+    this.compNode.knee.value = 8; // 自然にかかってほしいという気持ちで8に設定（リミッターなので0でも良いかも）
+    this.compNode.attack.value = 0; // クリッピングが起こらないように、すぐに圧縮を開始する
+    this.compNode.release.value = options.release; // 歪まないように少し遅めに設定
+
+    // メイクアップゲインで上がった分を下げる（圧縮していないときは元の音量で出力）
+    this.correctionGainNode.gain.value = 0.85;
+
+    this.setGainInDecibels(options.inputGain, this.inputGainNode);
+    this.setGainInDecibels(options.outputGain, this.outputGainNode);
+
+    this.inputGainNode.connect(this.compNode);
+    this.compNode.connect(this.correctionGainNode);
+    this.correctionGainNode.connect(this.outputGainNode);
+  }
+
+  private linearToDecibel(linearValue: number) {
+    if (linearValue === 0) {
+      return -1000;
+    }
+    return 20 * Math.log10(linearValue);
+  }
+
+  private decibelToLinear(decibelValue: number) {
+    if (decibelValue <= -1000) {
+      return 0;
+    }
+    return Math.pow(10, decibelValue / 20);
+  }
+
+  private getGainInDecibels(gainNode: GainNode) {
+    return this.linearToDecibel(gainNode.gain.value);
+  }
+
+  private setGainInDecibels(value: number, gainNode: GainNode) {
+    if (!Number.isFinite(value)) {
+      throw new Error("Not a finite number.");
+    }
+    gainNode.gain.value = this.decibelToLinear(value);
+  }
+}
+
+/**
+ * 音声が0dB（-1～1の範囲）を超えないようにクリップします。
+ */
+export class Clipper {
+  private readonly waveShaperNode: WaveShaperNode;
+
+  get input(): AudioNode {
+    return this.waveShaperNode;
+  }
+
+  get output(): AudioNode {
+    return this.waveShaperNode;
+  }
+
+  constructor(audioContext: BaseAudioContext) {
+    this.waveShaperNode = new WaveShaperNode(audioContext);
+    this.waveShaperNode.curve = new Float32Array([-1, 0, 1]);
+  }
+}
diff --git a/src/store/singing.ts b/src/store/singing.ts
index ab80e17eb9..3798097cc5 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -17,13 +17,15 @@ import {
   AudioPlayer,
   AudioSequence,
   ChannelStrip,
+  Clipper,
   Instrument,
+  Limiter,
   NoteEvent,
   NoteSequence,
-  Sequence,
+  OfflineTransport,
   PolySynth,
+  Sequence,
   Transport,
-  OfflineTransport,
 } from "@/infrastructures/AudioRenderer";
 import { EngineId, StyleId } from "@/type/preload";
 import {
@@ -245,14 +247,20 @@ const DEFAULT_BEAT_TYPE = 4;
 let audioContext: AudioContext | undefined;
 let transport: Transport | undefined;
 let channelStrip: ChannelStrip | undefined;
+let limiter: Limiter | undefined;
+let clipper: Clipper | undefined;
 
 // NOTE: テスト時はAudioContextが存在しない
 if (window.AudioContext) {
   audioContext = new AudioContext();
   transport = new Transport(audioContext);
   channelStrip = new ChannelStrip(audioContext);
+  limiter = new Limiter(audioContext);
+  clipper = new Clipper(audioContext);
 
-  channelStrip.output.connect(audioContext.destination);
+  channelStrip.output.connect(limiter.input);
+  limiter.output.connect(clipper.input);
+  clipper.output.connect(audioContext.destination);
 }
 
 let playbackPosition = 0;
@@ -1758,6 +1766,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         }
 
         const sampleRate = 48000; // TODO: 設定できるようにする
+        const withLimiter = false; // TODO: 設定できるようにする
+
         const offlineAudioContext = new OfflineAudioContext(
           2,
           sampleRate * renderDuration,
@@ -1765,6 +1775,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         );
         const offlineTransport = new OfflineTransport();
         const channelStrip = new ChannelStrip(offlineAudioContext);
+        const limiter = withLimiter
+          ? new Limiter(offlineAudioContext)
+          : undefined;
+        const clipper = new Clipper(offlineAudioContext);
 
         for (const phrase of allPhrases.values()) {
           // TODO: この辺りの処理を共通化する
@@ -1800,7 +1814,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             offlineTransport.addSequence(noteSequence);
           }
         }
-        channelStrip.output.connect(offlineAudioContext.destination);
+        if (limiter) {
+          channelStrip.output.connect(limiter.input);
+          limiter.output.connect(clipper.input);
+        } else {
+          channelStrip.output.connect(clipper.input);
+        }
+        clipper.output.connect(offlineAudioContext.destination);
 
         // スケジューリングを行い、オフラインレンダリングを実行
         // TODO: オフラインレンダリング後にメモリーがきちんと開放されるか確認する

From aa06c6567c135a564dd0cf686bf27218d54f93c0 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sat, 7 Oct 2023 17:13:34 +0900
Subject: [PATCH 19/59] =?UTF-8?q?[project-s]=20=E3=82=A8=E3=83=B3=E3=82=B8?=
 =?UTF-8?q?=E3=83=B3=E3=83=97=E3=83=AD=E3=83=88=E3=82=BF=E3=82=A4=E3=83=97?=
 =?UTF-8?q?=E3=81=A7=E3=83=AC=E3=83=B3=E3=83=80=E3=83=AA=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=20(#1595)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openapi.json                                  |   2 +-
 src/openapi/.openapi-generator/FILES          |   1 +
 src/openapi/apis/DefaultApi.ts                |  70 ++++++++++-
 src/openapi/models/AccentPhrase.ts            |   2 +-
 src/openapi/models/AudioQuery.ts              |  16 ++-
 src/openapi/models/DownloadableLibrary.ts     |   2 +-
 src/openapi/models/EngineManifest.ts          |   2 +-
 src/openapi/models/HTTPValidationError.ts     |   2 +-
 src/openapi/models/InstalledLibrary.ts        |   2 +-
 src/openapi/models/LibrarySpeaker.ts          |   2 +-
 src/openapi/models/LicenseInfo.ts             |   2 +-
 src/openapi/models/Mora.ts                    |   2 +-
 src/openapi/models/MorphableTargetInfo.ts     |   2 +-
 src/openapi/models/ParseKanaBadRequest.ts     |  18 +--
 src/openapi/models/PeriodicData.ts            |  75 ++++++++++++
 src/openapi/models/Preset.ts                  |   2 +-
 src/openapi/models/Speaker.ts                 |   2 +-
 src/openapi/models/SpeakerInfo.ts             |   2 +-
 src/openapi/models/SpeakerStyle.ts            |   2 +-
 ...peakerSupportPermittedSynthesisMorphing.ts |   2 +-
 .../models/SpeakerSupportedFeatures.ts        |   2 +-
 src/openapi/models/StyleInfo.ts               |   2 +-
 src/openapi/models/SupportedDevicesInfo.ts    |   2 +-
 src/openapi/models/SupportedFeatures.ts       |   2 +-
 src/openapi/models/UpdateInfo.ts              |   2 +-
 src/openapi/models/UserDictWord.ts            |   2 +-
 src/openapi/models/ValidationError.ts         |   2 +-
 src/openapi/models/VvlibManifest.ts           |   2 +-
 src/openapi/models/WordTypes.ts               |   6 +-
 src/openapi/models/index.ts                   |   1 +
 src/openapi/runtime.ts                        |   2 +-
 src/store/singing.ts                          | 115 +++++++++++-------
 src/store/type.ts                             |   8 ++
 33 files changed, 277 insertions(+), 81 deletions(-)
 create mode 100644 src/openapi/models/PeriodicData.ts

diff --git a/openapi.json b/openapi.json
index 2686664d2e..45a73fd26b 100644
--- a/openapi.json
+++ b/openapi.json
@@ -1 +1 @@
-{"openapi":"3.0.2","info":{"title":"VOICEVOX Engine","description":"VOICEVOXの音声合成エンジンです。","version":"latest"},"paths":{"/audio_query":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリを作成する","description":"クエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_audio_query_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"},{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/audio_query_from_preset":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリをプリセットを用いて作成する","description":"クエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_from_preset_audio_query_from_preset_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"},{"required":true,"schema":{"title":"Preset Id","type":"integer"},"name":"preset_id","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/accent_phrases":{"post":{"tags":["クエリ編集"],"summary":"テキストからアクセント句を得る","description":"テキストからアクセント句を得ます。\nis_kanaが`true`のとき、テキストは次のようなAquesTalkライクな記法に従う読み仮名として処理されます。デフォルトは`false`です。\n* 全てのカナはカタカナで記述される\n* アクセント句は`/`または`、`で区切る。`、`で区切った場合に限り無音区間が挿入される。\n* カナの手前に`_`を入れるとそのカナは無声化される\n* アクセント位置を`'`で指定する。全てのアクセント句にはアクセント位置を1つ指定する必要がある。\n* アクセント句末に`？`(全角)を入れることにより疑問文の発音ができる。","operationId":"accent_phrases_accent_phrases_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"},{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Is Kana","type":"boolean","default":false},"name":"is_kana","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Accent Phrases Accent Phrases Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"400":{"description":"読み仮名のパースに失敗","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_data":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高・音素長を得る","operationId":"mora_data_mora_data_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Accent Phrases","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Mora Data Mora Data Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_length":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音素長を得る","operationId":"mora_length_mora_length_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Accent Phrases","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Mora Length Mora Length Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_pitch":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高を得る","operationId":"mora_pitch_mora_pitch_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Accent Phrases","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Mora Pitch Mora Pitch Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する","operationId":"synthesis_synthesis_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"description":"疑問系のテキストが与えられたら語尾を自動調整する","required":false,"schema":{"title":"Enable Interrogative Upspeak","type":"boolean","description":"疑問系のテキストが与えられたら語尾を自動調整する","default":true},"name":"enable_interrogative_upspeak","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/cancellable_synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する（キャンセル可能）","operationId":"cancellable_synthesis_cancellable_synthesis_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/multi_synthesis":{"post":{"tags":["音声合成"],"summary":"複数まとめて音声合成する","operationId":"multi_synthesis_multi_synthesis_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Queries","type":"array","items":{"$ref":"#/components/schemas/AudioQuery"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/zip":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/morphable_targets":{"post":{"tags":["音声合成"],"summary":"指定した話者に対してエンジン内の話者がモーフィングが可能か判定する","description":"指定されたベース話者に対してエンジン内の各話者がモーフィング機能を利用可能か返します。\nモーフィングの許可/禁止は`/speakers`の`speaker.supported_features.synthesis_morphing`に記載されています。\nプロパティが存在しない場合は、モーフィングが許可されているとみなします。\n返り値の話者はstring型なので注意。","operationId":"morphable_targets_morphable_targets_post","parameters":[{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Base Speakers","type":"array","items":{"type":"integer"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Morphable Targets Morphable Targets Post","type":"array","items":{"type":"object","additionalProperties":{"$ref":"#/components/schemas/MorphableTargetInfo"}}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis_morphing":{"post":{"tags":["音声合成"],"summary":"2人の話者でモーフィングした音声を合成する","description":"指定された2人の話者で音声を合成、指定した割合でモーフィングした音声を得ます。\nモーフィングの割合は`morph_rate`で指定でき、0.0でベースの話者、1.0でターゲットの話者に近づきます。","operationId":"_synthesis_morphing_synthesis_morphing_post","parameters":[{"required":true,"schema":{"title":"Base Speaker","type":"integer"},"name":"base_speaker","in":"query"},{"required":true,"schema":{"title":"Target Speaker","type":"integer"},"name":"target_speaker","in":"query"},{"required":true,"schema":{"title":"Morph Rate","maximum":1.0,"minimum":0.0,"type":"number"},"name":"morph_rate","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/connect_waves":{"post":{"tags":["その他"],"summary":"base64エンコードされた複数のwavデータを一つに結合する","description":"base64エンコードされたwavデータを一纏めにし、wavファイルで返します。","operationId":"connect_waves_connect_waves_post","requestBody":{"content":{"application/json":{"schema":{"title":"Waves","type":"array","items":{"type":"string"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/presets":{"get":{"tags":["その他"],"summary":"Get Presets","description":"エンジンが保持しているプリセットの設定を返します\n\nReturns\n-------\npresets: List[Preset]\n    プリセットのリスト","operationId":"get_presets_presets_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Get Presets Presets Get","type":"array","items":{"$ref":"#/components/schemas/Preset"}}}}}}}},"/add_preset":{"post":{"tags":["その他"],"summary":"Add Preset","description":"新しいプリセットを追加します\n\nParameters\n-------\npreset: Preset\n    新しいプリセット。\n    プリセットIDが既存のものと重複している場合は、新規のプリセットIDが採番されます。\n\nReturns\n-------\nid: int\n    追加したプリセットのプリセットID","operationId":"add_preset_add_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Add Preset Add Preset Post","type":"integer"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/update_preset":{"post":{"tags":["その他"],"summary":"Update Preset","description":"既存のプリセットを更新します\n\nParameters\n-------\npreset: Preset\n    更新するプリセット。\n    プリセットIDが更新対象と一致している必要があります。\n\nReturns\n-------\nid: int\n    更新したプリセットのプリセットID","operationId":"update_preset_update_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Update Preset Update Preset Post","type":"integer"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/delete_preset":{"post":{"tags":["その他"],"summary":"Delete Preset","description":"既存のプリセットを削除します\n\nParameters\n-------\nid: int\n    削除するプリセットのプリセットID","operationId":"delete_preset_delete_preset_post","parameters":[{"required":true,"schema":{"title":"Id","type":"integer"},"name":"id","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/version":{"get":{"tags":["その他"],"summary":"Version","operationId":"version_version_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{}}}}}}},"/core_versions":{"get":{"tags":["その他"],"summary":"Core Versions","operationId":"core_versions_core_versions_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Core Versions Core Versions Get","type":"array","items":{"type":"string"}}}}}}}},"/speakers":{"get":{"tags":["その他"],"summary":"Speakers","operationId":"speakers_speakers_get","parameters":[{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Speakers Speakers Get","type":"array","items":{"$ref":"#/components/schemas/Speaker"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/speaker_info":{"get":{"tags":["その他"],"summary":"Speaker Info","description":"指定されたspeaker_uuidに関する情報をjson形式で返します。\n画像や音声はbase64エンコードされたものが返されます。\n\nReturns\n-------\nret_data: SpeakerInfo","operationId":"speaker_info_speaker_info_get","parameters":[{"required":true,"schema":{"title":"Speaker Uuid","type":"string"},"name":"speaker_uuid","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SpeakerInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/downloadable_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Downloadable Libraries","description":"ダウンロード可能な音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: List[DownloadableLibrary]","operationId":"downloadable_libraries_downloadable_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Downloadable Libraries Downloadable Libraries Get","type":"array","items":{"$ref":"#/components/schemas/DownloadableLibrary"}}}}}}}},"/installed_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Installed Libraries","description":"インストールした音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: List[DownloadableLibrary]","operationId":"installed_libraries_installed_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Installed Libraries Installed Libraries Get","type":"object","additionalProperties":{"$ref":"#/components/schemas/InstalledLibrary"}}}}}}}},"/install_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Install Library","description":"音声ライブラリをインストールします。\n音声ライブラリのZIPファイルをリクエストボディとして送信してください。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"install_library_install_library__library_uuid__post","parameters":[{"required":true,"schema":{"title":"Library Uuid","type":"string"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/uninstall_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Uninstall Library","description":"音声ライブラリをアンインストールします。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"uninstall_library_uninstall_library__library_uuid__post","parameters":[{"required":true,"schema":{"title":"Library Uuid","type":"string"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_speaker":{"post":{"tags":["その他"],"summary":"Initialize Speaker","description":"指定されたspeaker_idの話者を初期化します。\n実行しなくても他のAPIは使用できますが、初回実行時に時間がかかることがあります。","operationId":"initialize_speaker_initialize_speaker_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"description":"既に初期化済みの話者の再初期化をスキップするかどうか","required":false,"schema":{"title":"Skip Reinit","type":"boolean","description":"既に初期化済みの話者の再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/is_initialized_speaker":{"get":{"tags":["その他"],"summary":"Is Initialized Speaker","description":"指定されたspeaker_idの話者が初期化されているかどうかを返します。","operationId":"is_initialized_speaker_is_initialized_speaker_get","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Is Initialized Speaker Is Initialized Speaker Get","type":"boolean"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict":{"get":{"tags":["ユーザー辞書"],"summary":"Get User Dict Words","description":"ユーザー辞書に登録されている単語の一覧を返します。\n単語の表層形(surface)は正規化済みの物を返します。\n\nReturns\n-------\nDict[str, UserDictWord]\n    単語のUUIDとその詳細","operationId":"get_user_dict_words_user_dict_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Get User Dict Words User Dict Get","type":"object","additionalProperties":{"$ref":"#/components/schemas/UserDictWord"}}}}}}}},"/user_dict_word":{"post":{"tags":["ユーザー辞書"],"summary":"Add User Dict Word","description":"ユーザー辞書に言葉を追加します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"add_user_dict_word_user_dict_word_post","parameters":[{"required":true,"schema":{"title":"Surface","type":"string"},"name":"surface","in":"query"},{"required":true,"schema":{"title":"Pronunciation","type":"string"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"title":"Accent Type","type":"integer"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"title":"Priority","maximum":10.0,"minimum":0.0,"type":"integer"},"name":"priority","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Add User Dict Word User Dict Word Post","type":"string"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict_word/{word_uuid}":{"put":{"tags":["ユーザー辞書"],"summary":"Rewrite User Dict Word","description":"ユーザー辞書に登録されている言葉を更新します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_uuid: str\n    更新する言葉のUUID\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"rewrite_user_dict_word_user_dict_word__word_uuid__put","parameters":[{"required":true,"schema":{"title":"Word Uuid","type":"string"},"name":"word_uuid","in":"path"},{"required":true,"schema":{"title":"Surface","type":"string"},"name":"surface","in":"query"},{"required":true,"schema":{"title":"Pronunciation","type":"string"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"title":"Accent Type","type":"integer"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"title":"Priority","maximum":10.0,"minimum":0.0,"type":"integer"},"name":"priority","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}},"delete":{"tags":["ユーザー辞書"],"summary":"Delete User Dict Word","description":"ユーザー辞書に登録されている言葉を削除します。\n\nParameters\n----------\nword_uuid: str\n    削除する言葉のUUID","operationId":"delete_user_dict_word_user_dict_word__word_uuid__delete","parameters":[{"required":true,"schema":{"title":"Word Uuid","type":"string"},"name":"word_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/import_user_dict":{"post":{"tags":["ユーザー辞書"],"summary":"Import User Dict Words","description":"他のユーザー辞書をインポートします。\n\nParameters\n----------\nimport_dict_data: Dict[str, UserDictWord]\n    インポートするユーザー辞書のデータ\noverride: bool\n    重複したエントリがあった場合、上書きするかどうか","operationId":"import_user_dict_words_import_user_dict_post","parameters":[{"required":true,"schema":{"title":"Override","type":"boolean"},"name":"override","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Import Dict Data","type":"object","additionalProperties":{"$ref":"#/components/schemas/UserDictWord"}}}},"required":true},"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/supported_devices":{"get":{"tags":["その他"],"summary":"Supported Devices","operationId":"supported_devices_supported_devices_get","parameters":[{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SupportedDevicesInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/engine_manifest":{"get":{"tags":["その他"],"summary":"Engine Manifest","operationId":"engine_manifest_engine_manifest_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/EngineManifest"}}}}}}},"/validate_kana":{"post":{"tags":["その他"],"summary":"テキストがAquesTalkライクな記法に従っているか判定する","description":"テキストがAquesTalkライクな記法に従っているかどうかを判定します。\n従っていない場合はエラーが返ります。\n\nParameters\n----------\ntext: str\n    判定する対象の文字列","operationId":"validate_kana_validate_kana_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Validate Kana Validate Kana Post","type":"boolean"}}}},"400":{"description":"テキストが不正です","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/setting":{"get":{"tags":["設定"],"summary":"Setting Get","operationId":"setting_get_setting_get","responses":{"200":{"description":"Successful Response","content":{"text/html":{"schema":{"type":"string"}}}}}},"post":{"tags":["設定"],"summary":"Setting Post","operationId":"setting_post_setting_post","requestBody":{"content":{"application/x-www-form-urlencoded":{"schema":{"$ref":"#/components/schemas/Body_setting_post_setting_post"}}}},"responses":{"200":{"description":"Successful Response","content":{"text/html":{"schema":{"type":"string"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}}},"components":{"schemas":{"AccentPhrase":{"title":"AccentPhrase","required":["moras","accent"],"type":"object","properties":{"moras":{"title":"モーラのリスト","type":"array","items":{"$ref":"#/components/schemas/Mora"}},"accent":{"title":"アクセント箇所","type":"integer"},"pause_mora":{"title":"後ろに無音を付けるかどうか","allOf":[{"$ref":"#/components/schemas/Mora"}]},"is_interrogative":{"title":"疑問系かどうか","type":"boolean","default":false}},"description":"アクセント句ごとの情報"},"AudioQuery":{"title":"AudioQuery","required":["accent_phrases","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength","outputSamplingRate","outputStereo"],"type":"object","properties":{"accent_phrases":{"title":"アクセント句のリスト","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}},"speedScale":{"title":"全体の話速","type":"number"},"pitchScale":{"title":"全体の音高","type":"number"},"intonationScale":{"title":"全体の抑揚","type":"number"},"volumeScale":{"title":"全体の音量","type":"number"},"prePhonemeLength":{"title":"音声の前の無音時間","type":"number"},"postPhonemeLength":{"title":"音声の後の無音時間","type":"number"},"outputSamplingRate":{"title":"音声データの出力サンプリングレート","type":"integer"},"outputStereo":{"title":"音声データをステレオ出力するか否か","type":"boolean"},"kana":{"title":"[読み取り専用]AquesTalkライクな読み仮名。音声合成クエリとしては無視される","type":"string"}},"description":"音声合成用のクエリ"},"Body_setting_post_setting_post":{"title":"Body_setting_post_setting_post","type":"object","properties":{"cors_policy_mode":{"title":"Cors Policy Mode","type":"string"},"allow_origin":{"title":"Allow Origin","type":"string"}}},"DownloadableLibrary":{"title":"DownloadableLibrary","required":["name","uuid","version","download_url","bytes","speakers"],"type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}}},"description":"ダウンロード可能な音声ライブラリの情報"},"EngineManifest":{"title":"EngineManifest","required":["manifest_version","name","brand_name","uuid","url","icon","default_sampling_rate","terms_of_service","update_infos","dependency_licenses","supported_features"],"type":"object","properties":{"manifest_version":{"title":"マニフェストのバージョン","type":"string"},"name":{"title":"エンジン名","type":"string"},"brand_name":{"title":"ブランド名","type":"string"},"uuid":{"title":"エンジンのUUID","type":"string"},"url":{"title":"エンジンのURL","type":"string"},"icon":{"title":"エンジンのアイコンをBASE64エンコードしたもの","type":"string"},"default_sampling_rate":{"title":"デフォルトのサンプリング周波数","type":"integer"},"terms_of_service":{"title":"エンジンの利用規約","type":"string"},"update_infos":{"title":"エンジンのアップデート情報","type":"array","items":{"$ref":"#/components/schemas/UpdateInfo"}},"dependency_licenses":{"title":"依存関係のライセンス情報","type":"array","items":{"$ref":"#/components/schemas/LicenseInfo"}},"supported_vvlib_manifest_version":{"title":"エンジンが対応するvvlibのバージョン","type":"string"},"supported_features":{"title":"エンジンが持つ機能","allOf":[{"$ref":"#/components/schemas/SupportedFeatures"}]}},"description":"エンジン自体に関する情報"},"HTTPValidationError":{"title":"HTTPValidationError","type":"object","properties":{"detail":{"title":"Detail","type":"array","items":{"$ref":"#/components/schemas/ValidationError"}}}},"InstalledLibrary":{"title":"InstalledLibrary","required":["name","uuid","version","download_url","bytes","speakers","uninstallable"],"type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}},"uninstallable":{"title":"アンインストール可能かどうか","type":"boolean"}},"description":"インストール済み音声ライブラリの情報"},"LibrarySpeaker":{"title":"LibrarySpeaker","required":["speaker","speaker_info"],"type":"object","properties":{"speaker":{"title":"話者情報","allOf":[{"$ref":"#/components/schemas/Speaker"}]},"speaker_info":{"title":"話者の追加情報","allOf":[{"$ref":"#/components/schemas/SpeakerInfo"}]}},"description":"音声ライブラリに含まれる話者の情報"},"LicenseInfo":{"title":"LicenseInfo","required":["name","text"],"type":"object","properties":{"name":{"title":"依存ライブラリ名","type":"string"},"version":{"title":"依存ライブラリのバージョン","type":"string"},"license":{"title":"依存ライブラリのライセンス名","type":"string"},"text":{"title":"依存ライブラリのライセンス本文","type":"string"}},"description":"依存ライブラリのライセンス情報"},"Mora":{"title":"Mora","required":["text","vowel","vowel_length","pitch"],"type":"object","properties":{"text":{"title":"文字","type":"string"},"consonant":{"title":"子音の音素","type":"string"},"consonant_length":{"title":"子音の音長","type":"number"},"vowel":{"title":"母音の音素","type":"string"},"vowel_length":{"title":"母音の音長","type":"number"},"pitch":{"title":"音高","type":"number"}},"description":"モーラ（子音＋母音）ごとの情報"},"MorphableTargetInfo":{"title":"MorphableTargetInfo","required":["is_morphable"],"type":"object","properties":{"is_morphable":{"title":"指定した話者に対してモーフィングの可否","type":"boolean"}}},"ParseKanaBadRequest":{"title":"ParseKanaBadRequest","required":["text","error_name","error_args"],"type":"object","properties":{"text":{"title":"エラーメッセージ","type":"string"},"error_name":{"title":"エラー名","type":"string","description":"|name|description|\n|---|---|\n| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |\n| ACCENT_TOP | 句頭にアクセントは置けません: {text} |\n| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |\n| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |\n| EMPTY_PHRASE | {position}番目のアクセント句が空白です |\n| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |\n| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |"},"error_args":{"title":"エラーを起こした箇所","type":"object","additionalProperties":{"type":"string"}}}},"Preset":{"title":"Preset","required":["id","name","speaker_uuid","style_id","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength"],"type":"object","properties":{"id":{"title":"プリセットID","type":"integer"},"name":{"title":"プリセット名","type":"string"},"speaker_uuid":{"title":"スピーカーのUUID","type":"string"},"style_id":{"title":"スタイルID","type":"integer"},"speedScale":{"title":"全体の話速","type":"number"},"pitchScale":{"title":"全体の音高","type":"number"},"intonationScale":{"title":"全体の抑揚","type":"number"},"volumeScale":{"title":"全体の音量","type":"number"},"prePhonemeLength":{"title":"音声の前の無音時間","type":"number"},"postPhonemeLength":{"title":"音声の後の無音時間","type":"number"}},"description":"プリセット情報"},"Speaker":{"title":"Speaker","required":["name","speaker_uuid","styles"],"type":"object","properties":{"supported_features":{"title":"スピーカーの対応機能","allOf":[{"$ref":"#/components/schemas/SpeakerSupportedFeatures"}]},"name":{"title":"名前","type":"string"},"speaker_uuid":{"title":"スピーカーのUUID","type":"string"},"styles":{"title":"スピーカースタイルの一覧","type":"array","items":{"$ref":"#/components/schemas/SpeakerStyle"}},"version":{"title":"Version","type":"string","default":"スピーカーのバージョン"}},"description":"スピーカー情報"},"SpeakerInfo":{"title":"SpeakerInfo","required":["policy","portrait","style_infos"],"type":"object","properties":{"policy":{"title":"policy.md","type":"string"},"portrait":{"title":"portrait.pngをbase64エンコードしたもの","type":"string"},"style_infos":{"title":"スタイルの追加情報","type":"array","items":{"$ref":"#/components/schemas/StyleInfo"}}},"description":"話者の追加情報"},"SpeakerStyle":{"title":"SpeakerStyle","required":["name","id"],"type":"object","properties":{"name":{"title":"スタイル名","type":"string"},"id":{"title":"スタイルID","type":"integer"}},"description":"スピーカーのスタイル情報"},"SpeakerSupportPermittedSynthesisMorphing":{"title":"SpeakerSupportPermittedSynthesisMorphing","enum":["ALL","SELF_ONLY","NOTHING"],"type":"string","description":"An enumeration."},"SpeakerSupportedFeatures":{"title":"SpeakerSupportedFeatures","type":"object","properties":{"permitted_synthesis_morphing":{"title":"モーフィング機能への対応","allOf":[{"$ref":"#/components/schemas/SpeakerSupportPermittedSynthesisMorphing"}],"default":"ALL"}},"description":"話者の対応機能の情報"},"StyleInfo":{"title":"StyleInfo","required":["id","icon","voice_samples"],"type":"object","properties":{"id":{"title":"スタイルID","type":"integer"},"icon":{"title":"当該スタイルのアイコンをbase64エンコードしたもの","type":"string"},"portrait":{"title":"当該スタイルのportrait.pngをbase64エンコードしたもの","type":"string"},"voice_samples":{"title":"voice_sampleのwavファイルをbase64エンコードしたもの","type":"array","items":{"type":"string"}}},"description":"スタイルの追加情報"},"SupportedDevicesInfo":{"title":"SupportedDevicesInfo","required":["cpu","cuda","dml"],"type":"object","properties":{"cpu":{"title":"CPUに対応しているか","type":"boolean"},"cuda":{"title":"CUDA(Nvidia GPU)に対応しているか","type":"boolean"},"dml":{"title":"DirectML(Nvidia GPU/Radeon GPU等)に対応しているか","type":"boolean"}},"description":"対応しているデバイスの情報"},"SupportedFeatures":{"title":"SupportedFeatures","required":["adjust_mora_pitch","adjust_phoneme_length","adjust_speed_scale","adjust_pitch_scale","adjust_intonation_scale","adjust_volume_scale","interrogative_upspeak","synthesis_morphing"],"type":"object","properties":{"adjust_mora_pitch":{"title":"モーラごとの音高の調整","type":"boolean"},"adjust_phoneme_length":{"title":"音素ごとの長さの調整","type":"boolean"},"adjust_speed_scale":{"title":"全体の話速の調整","type":"boolean"},"adjust_pitch_scale":{"title":"全体の音高の調整","type":"boolean"},"adjust_intonation_scale":{"title":"全体の抑揚の調整","type":"boolean"},"adjust_volume_scale":{"title":"全体の音量の調整","type":"boolean"},"interrogative_upspeak":{"title":"疑問文の自動調整","type":"boolean"},"synthesis_morphing":{"title":"2人の話者でモーフィングした音声を合成","type":"boolean"},"manage_library":{"title":"音声ライブラリのインストール・アンインストール","type":"boolean"}},"description":"エンジンが持つ機能の一覧"},"UpdateInfo":{"title":"UpdateInfo","required":["version","descriptions"],"type":"object","properties":{"version":{"title":"エンジンのバージョン名","type":"string"},"descriptions":{"title":"アップデートの詳細についての説明","type":"array","items":{"type":"string"}},"contributors":{"title":"貢献者名","type":"array","items":{"type":"string"}}},"description":"エンジンのアップデート情報"},"UserDictWord":{"title":"UserDictWord","required":["surface","priority","part_of_speech","part_of_speech_detail_1","part_of_speech_detail_2","part_of_speech_detail_3","inflectional_type","inflectional_form","stem","yomi","pronunciation","accent_type","accent_associative_rule"],"type":"object","properties":{"surface":{"title":"表層形","type":"string"},"priority":{"title":"優先度","maximum":10.0,"minimum":0.0,"type":"integer"},"context_id":{"title":"文脈ID","type":"integer","default":1348},"part_of_speech":{"title":"品詞","type":"string"},"part_of_speech_detail_1":{"title":"品詞細分類1","type":"string"},"part_of_speech_detail_2":{"title":"品詞細分類2","type":"string"},"part_of_speech_detail_3":{"title":"品詞細分類3","type":"string"},"inflectional_type":{"title":"活用型","type":"string"},"inflectional_form":{"title":"活用形","type":"string"},"stem":{"title":"原形","type":"string"},"yomi":{"title":"読み","type":"string"},"pronunciation":{"title":"発音","type":"string"},"accent_type":{"title":"アクセント型","type":"integer"},"mora_count":{"title":"モーラ数","type":"integer"},"accent_associative_rule":{"title":"アクセント結合規則","type":"string"}},"description":"辞書のコンパイルに使われる情報"},"ValidationError":{"title":"ValidationError","required":["loc","msg","type"],"type":"object","properties":{"loc":{"title":"Location","type":"array","items":{"type":"string"}},"msg":{"title":"Message","type":"string"},"type":{"title":"Error Type","type":"string"}}},"WordTypes":{"title":"WordTypes","enum":["PROPER_NOUN","COMMON_NOUN","VERB","ADJECTIVE","SUFFIX"],"type":"string","description":"\n    fastapiでword_type引数を検証する時に使用するクラス\n    "},"VvlibManifest":{"title":"VvlibManifest","description":"vvlib(VOICEVOX Library)に関する情報","type":"object","properties":{"manifest_version":{"title":"マニフェストバージョン","type":"string"},"name":{"title":"音声ライブラリ名","type":"string"},"version":{"title":"音声ライブラリバージョン","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"brand_name":{"title":"エンジンのブランド名","type":"string"},"engine_name":{"title":"エンジン名","type":"string"},"engine_uuid":{"title":"エンジンのUUID","type":"string"}},"required":["manifest_version","name","version","uuid","brand_name","engine_name","engine_uuid"]}}}}
\ No newline at end of file
+{"openapi":"3.0.2","info":{"title":"VOICEVOX Engine","description":"VOICEVOXの音声合成エンジンです。","version":"0.15.0-projects.3"},"paths":{"/audio_query":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリを作成する","description":"クエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_audio_query_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"},{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/audio_query_from_preset":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリをプリセットを用いて作成する","description":"クエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_from_preset_audio_query_from_preset_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"},{"required":true,"schema":{"title":"Preset Id","type":"integer"},"name":"preset_id","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/accent_phrases":{"post":{"tags":["クエリ編集"],"summary":"テキストからアクセント句を得る","description":"テキストからアクセント句を得ます。\nis_kanaが`true`のとき、テキストは次のようなAquesTalkライクな記法に従う読み仮名として処理されます。デフォルトは`false`です。\n* 全てのカナはカタカナで記述される\n* アクセント句は`/`または`、`で区切る。`、`で区切った場合に限り無音区間が挿入される。\n* カナの手前に`_`を入れるとそのカナは無声化される\n* アクセント位置を`'`で指定する。全てのアクセント句にはアクセント位置を1つ指定する必要がある。\n* アクセント句末に`？`(全角)を入れることにより疑問文の発音ができる。","operationId":"accent_phrases_accent_phrases_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"},{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Is Kana","type":"boolean","default":false},"name":"is_kana","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Accent Phrases Accent Phrases Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"400":{"description":"読み仮名のパースに失敗","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_data":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高・音素長を得る","operationId":"mora_data_mora_data_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Accent Phrases","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Mora Data Mora Data Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_length":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音素長を得る","operationId":"mora_length_mora_length_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Accent Phrases","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Mora Length Mora Length Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_pitch":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高を得る","operationId":"mora_pitch_mora_pitch_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Accent Phrases","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Mora Pitch Mora Pitch Post","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/periodic_pitch":{"post":{"tags":["クエリ編集"],"summary":"音声合成用のクエリから音高の時系列を得る","operationId":"periodic_pitch_periodic_pitch_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する","operationId":"synthesis_synthesis_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"description":"疑問系のテキストが与えられたら語尾を自動調整する","required":false,"schema":{"title":"Enable Interrogative Upspeak","type":"boolean","description":"疑問系のテキストが与えられたら語尾を自動調整する","default":true},"name":"enable_interrogative_upspeak","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/cancellable_synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する（キャンセル可能）","operationId":"cancellable_synthesis_cancellable_synthesis_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/multi_synthesis":{"post":{"tags":["音声合成"],"summary":"複数まとめて音声合成する","operationId":"multi_synthesis_multi_synthesis_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Queries","type":"array","items":{"$ref":"#/components/schemas/AudioQuery"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/zip":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/morphable_targets":{"post":{"tags":["音声合成"],"summary":"指定した話者に対してエンジン内の話者がモーフィングが可能か判定する","description":"指定されたベース話者に対してエンジン内の各話者がモーフィング機能を利用可能か返します。\nモーフィングの許可/禁止は`/speakers`の`speaker.supported_features.synthesis_morphing`に記載されています。\nプロパティが存在しない場合は、モーフィングが許可されているとみなします。\n返り値の話者はstring型なので注意。","operationId":"morphable_targets_morphable_targets_post","parameters":[{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Base Speakers","type":"array","items":{"type":"integer"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Morphable Targets Morphable Targets Post","type":"array","items":{"type":"object","additionalProperties":{"$ref":"#/components/schemas/MorphableTargetInfo"}}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis_morphing":{"post":{"tags":["音声合成"],"summary":"2人の話者でモーフィングした音声を合成する","description":"指定された2人の話者で音声を合成、指定した割合でモーフィングした音声を得ます。\nモーフィングの割合は`morph_rate`で指定でき、0.0でベースの話者、1.0でターゲットの話者に近づきます。","operationId":"_synthesis_morphing_synthesis_morphing_post","parameters":[{"required":true,"schema":{"title":"Base Speaker","type":"integer"},"name":"base_speaker","in":"query"},{"required":true,"schema":{"title":"Target Speaker","type":"integer"},"name":"target_speaker","in":"query"},{"required":true,"schema":{"title":"Morph Rate","maximum":1.0,"minimum":0.0,"type":"number"},"name":"morph_rate","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/connect_waves":{"post":{"tags":["その他"],"summary":"base64エンコードされた複数のwavデータを一つに結合する","description":"base64エンコードされたwavデータを一纏めにし、wavファイルで返します。","operationId":"connect_waves_connect_waves_post","requestBody":{"content":{"application/json":{"schema":{"title":"Waves","type":"array","items":{"type":"string"}}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/presets":{"get":{"tags":["その他"],"summary":"Get Presets","description":"エンジンが保持しているプリセットの設定を返します\n\nReturns\n-------\npresets: List[Preset]\n    プリセットのリスト","operationId":"get_presets_presets_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Get Presets Presets Get","type":"array","items":{"$ref":"#/components/schemas/Preset"}}}}}}}},"/add_preset":{"post":{"tags":["その他"],"summary":"Add Preset","description":"新しいプリセットを追加します\n\nParameters\n-------\npreset: Preset\n    新しいプリセット。\n    プリセットIDが既存のものと重複している場合は、新規のプリセットIDが採番されます。\n\nReturns\n-------\nid: int\n    追加したプリセットのプリセットID","operationId":"add_preset_add_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Add Preset Add Preset Post","type":"integer"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/update_preset":{"post":{"tags":["その他"],"summary":"Update Preset","description":"既存のプリセットを更新します\n\nParameters\n-------\npreset: Preset\n    更新するプリセット。\n    プリセットIDが更新対象と一致している必要があります。\n\nReturns\n-------\nid: int\n    更新したプリセットのプリセットID","operationId":"update_preset_update_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Update Preset Update Preset Post","type":"integer"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/delete_preset":{"post":{"tags":["その他"],"summary":"Delete Preset","description":"既存のプリセットを削除します\n\nParameters\n-------\nid: int\n    削除するプリセットのプリセットID","operationId":"delete_preset_delete_preset_post","parameters":[{"required":true,"schema":{"title":"Id","type":"integer"},"name":"id","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/version":{"get":{"tags":["その他"],"summary":"Version","operationId":"version_version_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{}}}}}}},"/core_versions":{"get":{"tags":["その他"],"summary":"Core Versions","operationId":"core_versions_core_versions_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Core Versions Core Versions Get","type":"array","items":{"type":"string"}}}}}}}},"/speakers":{"get":{"tags":["その他"],"summary":"Speakers","operationId":"speakers_speakers_get","parameters":[{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Speakers Speakers Get","type":"array","items":{"$ref":"#/components/schemas/Speaker"}}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/speaker_info":{"get":{"tags":["その他"],"summary":"Speaker Info","description":"指定されたspeaker_uuidに関する情報をjson形式で返します。\n画像や音声はbase64エンコードされたものが返されます。\n\nReturns\n-------\nret_data: SpeakerInfo","operationId":"speaker_info_speaker_info_get","parameters":[{"required":true,"schema":{"title":"Speaker Uuid","type":"string"},"name":"speaker_uuid","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SpeakerInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/downloadable_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Downloadable Libraries","description":"ダウンロード可能な音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: List[DownloadableLibrary]","operationId":"downloadable_libraries_downloadable_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Downloadable Libraries Downloadable Libraries Get","type":"array","items":{"$ref":"#/components/schemas/DownloadableLibrary"}}}}}}}},"/installed_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Installed Libraries","description":"インストールした音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: List[DownloadableLibrary]","operationId":"installed_libraries_installed_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Installed Libraries Installed Libraries Get","type":"object","additionalProperties":{"$ref":"#/components/schemas/InstalledLibrary"}}}}}}}},"/install_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Install Library","description":"音声ライブラリをインストールします。\n音声ライブラリのZIPファイルをリクエストボディとして送信してください。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"install_library_install_library__library_uuid__post","parameters":[{"required":true,"schema":{"title":"Library Uuid","type":"string"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/uninstall_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Uninstall Library","description":"音声ライブラリをアンインストールします。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"uninstall_library_uninstall_library__library_uuid__post","parameters":[{"required":true,"schema":{"title":"Library Uuid","type":"string"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_speaker":{"post":{"tags":["その他"],"summary":"Initialize Speaker","description":"指定されたspeaker_idの話者を初期化します。\n実行しなくても他のAPIは使用できますが、初回実行時に時間がかかることがあります。","operationId":"initialize_speaker_initialize_speaker_post","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"description":"既に初期化済みの話者の再初期化をスキップするかどうか","required":false,"schema":{"title":"Skip Reinit","type":"boolean","description":"既に初期化済みの話者の再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/is_initialized_speaker":{"get":{"tags":["その他"],"summary":"Is Initialized Speaker","description":"指定されたspeaker_idの話者が初期化されているかどうかを返します。","operationId":"is_initialized_speaker_is_initialized_speaker_get","parameters":[{"required":true,"schema":{"title":"Speaker","type":"integer"},"name":"speaker","in":"query"},{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Is Initialized Speaker Is Initialized Speaker Get","type":"boolean"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict":{"get":{"tags":["ユーザー辞書"],"summary":"Get User Dict Words","description":"ユーザー辞書に登録されている単語の一覧を返します。\n単語の表層形(surface)は正規化済みの物を返します。\n\nReturns\n-------\nDict[str, UserDictWord]\n    単語のUUIDとその詳細","operationId":"get_user_dict_words_user_dict_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Get User Dict Words User Dict Get","type":"object","additionalProperties":{"$ref":"#/components/schemas/UserDictWord"}}}}}}}},"/user_dict_word":{"post":{"tags":["ユーザー辞書"],"summary":"Add User Dict Word","description":"ユーザー辞書に言葉を追加します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"add_user_dict_word_user_dict_word_post","parameters":[{"required":true,"schema":{"title":"Surface","type":"string"},"name":"surface","in":"query"},{"required":true,"schema":{"title":"Pronunciation","type":"string"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"title":"Accent Type","type":"integer"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"title":"Priority","maximum":10.0,"minimum":0.0,"type":"integer"},"name":"priority","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Add User Dict Word User Dict Word Post","type":"string"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict_word/{word_uuid}":{"put":{"tags":["ユーザー辞書"],"summary":"Rewrite User Dict Word","description":"ユーザー辞書に登録されている言葉を更新します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_uuid: str\n    更新する言葉のUUID\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"rewrite_user_dict_word_user_dict_word__word_uuid__put","parameters":[{"required":true,"schema":{"title":"Word Uuid","type":"string"},"name":"word_uuid","in":"path"},{"required":true,"schema":{"title":"Surface","type":"string"},"name":"surface","in":"query"},{"required":true,"schema":{"title":"Pronunciation","type":"string"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"title":"Accent Type","type":"integer"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"title":"Priority","maximum":10.0,"minimum":0.0,"type":"integer"},"name":"priority","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}},"delete":{"tags":["ユーザー辞書"],"summary":"Delete User Dict Word","description":"ユーザー辞書に登録されている言葉を削除します。\n\nParameters\n----------\nword_uuid: str\n    削除する言葉のUUID","operationId":"delete_user_dict_word_user_dict_word__word_uuid__delete","parameters":[{"required":true,"schema":{"title":"Word Uuid","type":"string"},"name":"word_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/import_user_dict":{"post":{"tags":["ユーザー辞書"],"summary":"Import User Dict Words","description":"他のユーザー辞書をインポートします。\n\nParameters\n----------\nimport_dict_data: Dict[str, UserDictWord]\n    インポートするユーザー辞書のデータ\noverride: bool\n    重複したエントリがあった場合、上書きするかどうか","operationId":"import_user_dict_words_import_user_dict_post","parameters":[{"required":true,"schema":{"title":"Override","type":"boolean"},"name":"override","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"title":"Import Dict Data","type":"object","additionalProperties":{"$ref":"#/components/schemas/UserDictWord"}}}},"required":true},"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/supported_devices":{"get":{"tags":["その他"],"summary":"Supported Devices","operationId":"supported_devices_supported_devices_get","parameters":[{"required":false,"schema":{"title":"Core Version","type":"string"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SupportedDevicesInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/engine_manifest":{"get":{"tags":["その他"],"summary":"Engine Manifest","operationId":"engine_manifest_engine_manifest_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/EngineManifest"}}}}}}},"/validate_kana":{"post":{"tags":["その他"],"summary":"テキストがAquesTalkライクな記法に従っているか判定する","description":"テキストがAquesTalkライクな記法に従っているかどうかを判定します。\n従っていない場合はエラーが返ります。\n\nParameters\n----------\ntext: str\n    判定する対象の文字列","operationId":"validate_kana_validate_kana_post","parameters":[{"required":true,"schema":{"title":"Text","type":"string"},"name":"text","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"title":"Response Validate Kana Validate Kana Post","type":"boolean"}}}},"400":{"description":"テキストが不正です","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/setting":{"get":{"tags":["設定"],"summary":"Setting Get","operationId":"setting_get_setting_get","responses":{"200":{"description":"Successful Response","content":{"text/html":{"schema":{"type":"string"}}}}}},"post":{"tags":["設定"],"summary":"Setting Post","operationId":"setting_post_setting_post","requestBody":{"content":{"application/x-www-form-urlencoded":{"schema":{"$ref":"#/components/schemas/Body_setting_post_setting_post"}}}},"responses":{"200":{"description":"Successful Response","content":{"text/html":{"schema":{"type":"string"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}}},"components":{"schemas":{"AccentPhrase":{"title":"AccentPhrase","required":["moras","accent"],"type":"object","properties":{"moras":{"title":"モーラのリスト","type":"array","items":{"$ref":"#/components/schemas/Mora"}},"accent":{"title":"アクセント箇所","type":"integer"},"pause_mora":{"title":"後ろに無音を付けるかどうか","allOf":[{"$ref":"#/components/schemas/Mora"}]},"is_interrogative":{"title":"疑問系かどうか","type":"boolean","default":false}},"description":"アクセント句ごとの情報"},"AudioQuery":{"title":"AudioQuery","required":["accent_phrases","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength","outputSamplingRate","outputStereo"],"type":"object","properties":{"accent_phrases":{"title":"アクセント句のリスト","type":"array","items":{"$ref":"#/components/schemas/AccentPhrase"}},"periodic_pitch":{"title":"音高の時系列","allOf":[{"$ref":"#/components/schemas/PeriodicData"}]},"speedScale":{"title":"全体の話速","type":"number"},"pitchScale":{"title":"全体の音高","type":"number"},"intonationScale":{"title":"全体の抑揚","type":"number"},"volumeScale":{"title":"全体の音量","type":"number"},"prePhonemeLength":{"title":"音声の前の無音時間","type":"number"},"postPhonemeLength":{"title":"音声の後の無音時間","type":"number"},"outputSamplingRate":{"title":"音声データの出力サンプリングレート","type":"integer"},"outputStereo":{"title":"音声データをステレオ出力するか否か","type":"boolean"},"kana":{"title":"[読み取り専用]AquesTalkライクな読み仮名。音声合成クエリとしては無視される","type":"string"}},"description":"音声合成用のクエリ"},"Body_setting_post_setting_post":{"title":"Body_setting_post_setting_post","type":"object","properties":{"cors_policy_mode":{"title":"Cors Policy Mode","type":"string"},"allow_origin":{"title":"Allow Origin","type":"string"}}},"DownloadableLibrary":{"title":"DownloadableLibrary","required":["name","uuid","version","download_url","bytes","speakers"],"type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}}},"description":"ダウンロード可能な音声ライブラリの情報"},"EngineManifest":{"title":"EngineManifest","required":["manifest_version","name","brand_name","uuid","url","icon","default_sampling_rate","terms_of_service","update_infos","dependency_licenses","supported_features"],"type":"object","properties":{"manifest_version":{"title":"マニフェストのバージョン","type":"string"},"name":{"title":"エンジン名","type":"string"},"brand_name":{"title":"ブランド名","type":"string"},"uuid":{"title":"エンジンのUUID","type":"string"},"url":{"title":"エンジンのURL","type":"string"},"icon":{"title":"エンジンのアイコンをBASE64エンコードしたもの","type":"string"},"default_sampling_rate":{"title":"デフォルトのサンプリング周波数","type":"integer"},"terms_of_service":{"title":"エンジンの利用規約","type":"string"},"update_infos":{"title":"エンジンのアップデート情報","type":"array","items":{"$ref":"#/components/schemas/UpdateInfo"}},"dependency_licenses":{"title":"依存関係のライセンス情報","type":"array","items":{"$ref":"#/components/schemas/LicenseInfo"}},"supported_vvlib_manifest_version":{"title":"エンジンが対応するvvlibのバージョン","type":"string"},"supported_features":{"title":"エンジンが持つ機能","allOf":[{"$ref":"#/components/schemas/SupportedFeatures"}]}},"description":"エンジン自体に関する情報"},"HTTPValidationError":{"title":"HTTPValidationError","type":"object","properties":{"detail":{"title":"Detail","type":"array","items":{"$ref":"#/components/schemas/ValidationError"}}}},"InstalledLibrary":{"title":"InstalledLibrary","required":["name","uuid","version","download_url","bytes","speakers","uninstallable"],"type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}},"uninstallable":{"title":"アンインストール可能かどうか","type":"boolean"}},"description":"インストール済み音声ライブラリの情報"},"LibrarySpeaker":{"title":"LibrarySpeaker","required":["speaker","speaker_info"],"type":"object","properties":{"speaker":{"title":"話者情報","allOf":[{"$ref":"#/components/schemas/Speaker"}]},"speaker_info":{"title":"話者の追加情報","allOf":[{"$ref":"#/components/schemas/SpeakerInfo"}]}},"description":"音声ライブラリに含まれる話者の情報"},"LicenseInfo":{"title":"LicenseInfo","required":["name","text"],"type":"object","properties":{"name":{"title":"依存ライブラリ名","type":"string"},"version":{"title":"依存ライブラリのバージョン","type":"string"},"license":{"title":"依存ライブラリのライセンス名","type":"string"},"text":{"title":"依存ライブラリのライセンス本文","type":"string"}},"description":"依存ライブラリのライセンス情報"},"Mora":{"title":"Mora","required":["text","vowel","vowel_length","pitch"],"type":"object","properties":{"text":{"title":"文字","type":"string"},"consonant":{"title":"子音の音素","type":"string"},"consonant_length":{"title":"子音の音長","type":"number"},"vowel":{"title":"母音の音素","type":"string"},"vowel_length":{"title":"母音の音長","type":"number"},"pitch":{"title":"音高","type":"number"}},"description":"モーラ（子音＋母音）ごとの情報"},"MorphableTargetInfo":{"title":"MorphableTargetInfo","required":["is_morphable"],"type":"object","properties":{"is_morphable":{"title":"指定した話者に対してモーフィングの可否","type":"boolean"}}},"ParseKanaBadRequest":{"title":"ParseKanaBadRequest","required":["text","error_name","error_args"],"type":"object","properties":{"text":{"title":"エラーメッセージ","type":"string"},"error_name":{"title":"エラー名","type":"string","description":"|name|description|\n|---|---|\n| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |\n| ACCENT_TOP | 句頭にアクセントは置けません: {text} |\n| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |\n| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |\n| EMPTY_PHRASE | {position}番目のアクセント句が空白です |\n| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |\n| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |"},"error_args":{"title":"エラーを起こした箇所","type":"object","additionalProperties":{"type":"string"}}}},"PeriodicData":{"title":"PeriodicData","required":["rate","data"],"type":"object","properties":{"rate":{"title":"サンプリングレート","type":"number"},"data":{"title":"実際のデータ","type":"array","items":{"type":"number"}}},"description":"周期的なデータの情報"},"Preset":{"title":"Preset","required":["id","name","speaker_uuid","style_id","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength"],"type":"object","properties":{"id":{"title":"プリセットID","type":"integer"},"name":{"title":"プリセット名","type":"string"},"speaker_uuid":{"title":"スピーカーのUUID","type":"string"},"style_id":{"title":"スタイルID","type":"integer"},"speedScale":{"title":"全体の話速","type":"number"},"pitchScale":{"title":"全体の音高","type":"number"},"intonationScale":{"title":"全体の抑揚","type":"number"},"volumeScale":{"title":"全体の音量","type":"number"},"prePhonemeLength":{"title":"音声の前の無音時間","type":"number"},"postPhonemeLength":{"title":"音声の後の無音時間","type":"number"}},"description":"プリセット情報"},"Speaker":{"title":"Speaker","required":["name","speaker_uuid","styles"],"type":"object","properties":{"supported_features":{"title":"スピーカーの対応機能","allOf":[{"$ref":"#/components/schemas/SpeakerSupportedFeatures"}]},"name":{"title":"名前","type":"string"},"speaker_uuid":{"title":"スピーカーのUUID","type":"string"},"styles":{"title":"スピーカースタイルの一覧","type":"array","items":{"$ref":"#/components/schemas/SpeakerStyle"}},"version":{"title":"Version","type":"string","default":"スピーカーのバージョン"}},"description":"スピーカー情報"},"SpeakerInfo":{"title":"SpeakerInfo","required":["policy","portrait","style_infos"],"type":"object","properties":{"policy":{"title":"policy.md","type":"string"},"portrait":{"title":"portrait.pngをbase64エンコードしたもの","type":"string"},"style_infos":{"title":"スタイルの追加情報","type":"array","items":{"$ref":"#/components/schemas/StyleInfo"}}},"description":"話者の追加情報"},"SpeakerStyle":{"title":"SpeakerStyle","required":["name","id"],"type":"object","properties":{"name":{"title":"スタイル名","type":"string"},"id":{"title":"スタイルID","type":"integer"}},"description":"スピーカーのスタイル情報"},"SpeakerSupportPermittedSynthesisMorphing":{"title":"SpeakerSupportPermittedSynthesisMorphing","enum":["ALL","SELF_ONLY","NOTHING"],"type":"string","description":"An enumeration."},"SpeakerSupportedFeatures":{"title":"SpeakerSupportedFeatures","type":"object","properties":{"permitted_synthesis_morphing":{"title":"モーフィング機能への対応","allOf":[{"$ref":"#/components/schemas/SpeakerSupportPermittedSynthesisMorphing"}],"default":"ALL"}},"description":"話者の対応機能の情報"},"StyleInfo":{"title":"StyleInfo","required":["id","icon","voice_samples"],"type":"object","properties":{"id":{"title":"スタイルID","type":"integer"},"icon":{"title":"当該スタイルのアイコンをbase64エンコードしたもの","type":"string"},"portrait":{"title":"当該スタイルのportrait.pngをbase64エンコードしたもの","type":"string"},"voice_samples":{"title":"voice_sampleのwavファイルをbase64エンコードしたもの","type":"array","items":{"type":"string"}}},"description":"スタイルの追加情報"},"SupportedDevicesInfo":{"title":"SupportedDevicesInfo","required":["cpu","cuda","dml"],"type":"object","properties":{"cpu":{"title":"CPUに対応しているか","type":"boolean"},"cuda":{"title":"CUDA(Nvidia GPU)に対応しているか","type":"boolean"},"dml":{"title":"DirectML(Nvidia GPU/Radeon GPU等)に対応しているか","type":"boolean"}},"description":"対応しているデバイスの情報"},"SupportedFeatures":{"title":"SupportedFeatures","required":["adjust_mora_pitch","adjust_phoneme_length","adjust_speed_scale","adjust_pitch_scale","adjust_intonation_scale","adjust_volume_scale","interrogative_upspeak","synthesis_morphing"],"type":"object","properties":{"adjust_mora_pitch":{"title":"モーラごとの音高の調整","type":"boolean"},"adjust_phoneme_length":{"title":"音素ごとの長さの調整","type":"boolean"},"adjust_speed_scale":{"title":"全体の話速の調整","type":"boolean"},"adjust_pitch_scale":{"title":"全体の音高の調整","type":"boolean"},"adjust_intonation_scale":{"title":"全体の抑揚の調整","type":"boolean"},"adjust_volume_scale":{"title":"全体の音量の調整","type":"boolean"},"interrogative_upspeak":{"title":"疑問文の自動調整","type":"boolean"},"synthesis_morphing":{"title":"2人の話者でモーフィングした音声を合成","type":"boolean"},"manage_library":{"title":"音声ライブラリのインストール・アンインストール","type":"boolean"}},"description":"エンジンが持つ機能の一覧"},"UpdateInfo":{"title":"UpdateInfo","required":["version","descriptions"],"type":"object","properties":{"version":{"title":"エンジンのバージョン名","type":"string"},"descriptions":{"title":"アップデートの詳細についての説明","type":"array","items":{"type":"string"}},"contributors":{"title":"貢献者名","type":"array","items":{"type":"string"}}},"description":"エンジンのアップデート情報"},"UserDictWord":{"title":"UserDictWord","required":["surface","priority","part_of_speech","part_of_speech_detail_1","part_of_speech_detail_2","part_of_speech_detail_3","inflectional_type","inflectional_form","stem","yomi","pronunciation","accent_type","accent_associative_rule"],"type":"object","properties":{"surface":{"title":"表層形","type":"string"},"priority":{"title":"優先度","maximum":10.0,"minimum":0.0,"type":"integer"},"context_id":{"title":"文脈ID","type":"integer","default":1348},"part_of_speech":{"title":"品詞","type":"string"},"part_of_speech_detail_1":{"title":"品詞細分類1","type":"string"},"part_of_speech_detail_2":{"title":"品詞細分類2","type":"string"},"part_of_speech_detail_3":{"title":"品詞細分類3","type":"string"},"inflectional_type":{"title":"活用型","type":"string"},"inflectional_form":{"title":"活用形","type":"string"},"stem":{"title":"原形","type":"string"},"yomi":{"title":"読み","type":"string"},"pronunciation":{"title":"発音","type":"string"},"accent_type":{"title":"アクセント型","type":"integer"},"mora_count":{"title":"モーラ数","type":"integer"},"accent_associative_rule":{"title":"アクセント結合規則","type":"string"}},"description":"辞書のコンパイルに使われる情報"},"ValidationError":{"title":"ValidationError","required":["loc","msg","type"],"type":"object","properties":{"loc":{"title":"Location","type":"array","items":{"type":"string"}},"msg":{"title":"Message","type":"string"},"type":{"title":"Error Type","type":"string"}}},"WordTypes":{"title":"WordTypes","enum":["PROPER_NOUN","COMMON_NOUN","VERB","ADJECTIVE","SUFFIX"],"type":"string","description":"\n    fastapiでword_type引数を検証する時に使用するクラス\n    "},"VvlibManifest":{"title":"VvlibManifest","description":"vvlib(VOICEVOX Library)に関する情報","type":"object","properties":{"manifest_version":{"title":"マニフェストバージョン","type":"string"},"name":{"title":"音声ライブラリ名","type":"string"},"version":{"title":"音声ライブラリバージョン","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"brand_name":{"title":"エンジンのブランド名","type":"string"},"engine_name":{"title":"エンジン名","type":"string"},"engine_uuid":{"title":"エンジンのUUID","type":"string"}},"required":["manifest_version","name","version","uuid","brand_name","engine_name","engine_uuid"]}}}}
\ No newline at end of file
diff --git a/src/openapi/.openapi-generator/FILES b/src/openapi/.openapi-generator/FILES
index 3e91276466..3e9e0b0a3e 100644
--- a/src/openapi/.openapi-generator/FILES
+++ b/src/openapi/.openapi-generator/FILES
@@ -12,6 +12,7 @@ models/LicenseInfo.ts
 models/Mora.ts
 models/MorphableTargetInfo.ts
 models/ParseKanaBadRequest.ts
+models/PeriodicData.ts
 models/Preset.ts
 models/Speaker.ts
 models/SpeakerInfo.ts
diff --git a/src/openapi/apis/DefaultApi.ts b/src/openapi/apis/DefaultApi.ts
index 74459d9de3..49be3245c6 100644
--- a/src/openapi/apis/DefaultApi.ts
+++ b/src/openapi/apis/DefaultApi.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -159,6 +159,12 @@ export interface MultiSynthesisMultiSynthesisPostRequest {
     coreVersion?: string;
 }
 
+export interface PeriodicPitchPeriodicPitchPostRequest {
+    speaker: number;
+    audioQuery: AudioQuery;
+    coreVersion?: string;
+}
+
 export interface RewriteUserDictWordUserDictWordWordUuidPutRequest {
     wordUuid: string;
     surface: string;
@@ -617,6 +623,23 @@ export interface DefaultApiInterface {
      */
     multiSynthesisMultiSynthesisPost(requestParameters: MultiSynthesisMultiSynthesisPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Blob>;
 
+    /**
+     * 
+     * @summary 音声合成用のクエリから音高の時系列を得る
+     * @param {number} speaker 
+     * @param {AudioQuery} audioQuery 
+     * @param {string} [coreVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof DefaultApiInterface
+     */
+    periodicPitchPeriodicPitchPostRaw(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<AudioQuery>>;
+
+    /**
+     * 音声合成用のクエリから音高の時系列を得る
+     */
+    periodicPitchPeriodicPitchPost(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<AudioQuery>;
+
     /**
      * ユーザー辞書に登録されている言葉を更新します。  Parameters ---------- surface : str     言葉の表層形 pronunciation: str     言葉の発音（カタカナ） accent_type: int     アクセント型（音が下がる場所を指す） word_uuid: str     更新する言葉のUUID word_type: WordTypes, optional     PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか priority: int, optional     単語の優先度（0から10までの整数）     数字が大きいほど優先度が高くなる     1から9までの値を指定することを推奨
      * @summary Rewrite User Dict Word
@@ -1762,6 +1785,51 @@ export class DefaultApi extends runtime.BaseAPI implements DefaultApiInterface {
         return await response.value();
     }
 
+    /**
+     * 音声合成用のクエリから音高の時系列を得る
+     */
+    async periodicPitchPeriodicPitchPostRaw(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<AudioQuery>> {
+        if (requestParameters.speaker === null || requestParameters.speaker === undefined) {
+            throw new runtime.RequiredError('speaker','Required parameter requestParameters.speaker was null or undefined when calling periodicPitchPeriodicPitchPost.');
+        }
+
+        if (requestParameters.audioQuery === null || requestParameters.audioQuery === undefined) {
+            throw new runtime.RequiredError('audioQuery','Required parameter requestParameters.audioQuery was null or undefined when calling periodicPitchPeriodicPitchPost.');
+        }
+
+        const queryParameters: any = {};
+
+        if (requestParameters.speaker !== undefined) {
+            queryParameters['speaker'] = requestParameters.speaker;
+        }
+
+        if (requestParameters.coreVersion !== undefined) {
+            queryParameters['core_version'] = requestParameters.coreVersion;
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/periodic_pitch`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: AudioQueryToJSON(requestParameters.audioQuery),
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => AudioQueryFromJSON(jsonValue));
+    }
+
+    /**
+     * 音声合成用のクエリから音高の時系列を得る
+     */
+    async periodicPitchPeriodicPitchPost(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<AudioQuery> {
+        const response = await this.periodicPitchPeriodicPitchPostRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
     /**
      * ユーザー辞書に登録されている言葉を更新します。  Parameters ---------- surface : str     言葉の表層形 pronunciation: str     言葉の発音（カタカナ） accent_type: int     アクセント型（音が下がる場所を指す） word_uuid: str     更新する言葉のUUID word_type: WordTypes, optional     PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか priority: int, optional     単語の優先度（0から10までの整数）     数字が大きいほど優先度が高くなる     1から9までの値を指定することを推奨
      * Rewrite User Dict Word
diff --git a/src/openapi/models/AccentPhrase.ts b/src/openapi/models/AccentPhrase.ts
index 9361e65cd1..3022dff482 100644
--- a/src/openapi/models/AccentPhrase.ts
+++ b/src/openapi/models/AccentPhrase.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/AudioQuery.ts b/src/openapi/models/AudioQuery.ts
index 6dfe8177e5..cdd62c1fbf 100644
--- a/src/openapi/models/AudioQuery.ts
+++ b/src/openapi/models/AudioQuery.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -19,6 +19,12 @@ import {
     AccentPhraseFromJSONTyped,
     AccentPhraseToJSON,
 } from './AccentPhrase';
+import type { PeriodicData } from './PeriodicData';
+import {
+    PeriodicDataFromJSON,
+    PeriodicDataFromJSONTyped,
+    PeriodicDataToJSON,
+} from './PeriodicData';
 
 /**
  * 音声合成用のクエリ
@@ -32,6 +38,12 @@ export interface AudioQuery {
      * @memberof AudioQuery
      */
     accentPhrases: Array<AccentPhrase>;
+    /**
+     * 
+     * @type {PeriodicData}
+     * @memberof AudioQuery
+     */
+    periodicPitch?: PeriodicData;
     /**
      * 
      * @type {number}
@@ -117,6 +129,7 @@ export function AudioQueryFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     return {
         
         'accentPhrases': ((json['accent_phrases'] as Array<any>).map(AccentPhraseFromJSON)),
+        'periodicPitch': !exists(json, 'periodic_pitch') ? undefined : PeriodicDataFromJSON(json['periodic_pitch']),
         'speedScale': json['speedScale'],
         'pitchScale': json['pitchScale'],
         'intonationScale': json['intonationScale'],
@@ -139,6 +152,7 @@ export function AudioQueryToJSON(value?: AudioQuery | null): any {
     return {
         
         'accent_phrases': ((value.accentPhrases as Array<any>).map(AccentPhraseToJSON)),
+        'periodic_pitch': PeriodicDataToJSON(value.periodicPitch),
         'speedScale': value.speedScale,
         'pitchScale': value.pitchScale,
         'intonationScale': value.intonationScale,
diff --git a/src/openapi/models/DownloadableLibrary.ts b/src/openapi/models/DownloadableLibrary.ts
index 2d7ac8e636..e6566d0a67 100644
--- a/src/openapi/models/DownloadableLibrary.ts
+++ b/src/openapi/models/DownloadableLibrary.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/EngineManifest.ts b/src/openapi/models/EngineManifest.ts
index 9795e3bcfe..e441e6e775 100644
--- a/src/openapi/models/EngineManifest.ts
+++ b/src/openapi/models/EngineManifest.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/HTTPValidationError.ts b/src/openapi/models/HTTPValidationError.ts
index 75c74fa13b..e55f144aed 100644
--- a/src/openapi/models/HTTPValidationError.ts
+++ b/src/openapi/models/HTTPValidationError.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/InstalledLibrary.ts b/src/openapi/models/InstalledLibrary.ts
index e8da64185d..2bfff3c855 100644
--- a/src/openapi/models/InstalledLibrary.ts
+++ b/src/openapi/models/InstalledLibrary.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/LibrarySpeaker.ts b/src/openapi/models/LibrarySpeaker.ts
index dcff3ee459..9a3eb28115 100644
--- a/src/openapi/models/LibrarySpeaker.ts
+++ b/src/openapi/models/LibrarySpeaker.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/LicenseInfo.ts b/src/openapi/models/LicenseInfo.ts
index 7176e993cb..41086eed0e 100644
--- a/src/openapi/models/LicenseInfo.ts
+++ b/src/openapi/models/LicenseInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/Mora.ts b/src/openapi/models/Mora.ts
index 430d8c2983..62da76c096 100644
--- a/src/openapi/models/Mora.ts
+++ b/src/openapi/models/Mora.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/MorphableTargetInfo.ts b/src/openapi/models/MorphableTargetInfo.ts
index a7627ddb8b..c7e98c8dd3 100644
--- a/src/openapi/models/MorphableTargetInfo.ts
+++ b/src/openapi/models/MorphableTargetInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/ParseKanaBadRequest.ts b/src/openapi/models/ParseKanaBadRequest.ts
index 8951aeaf87..3641069d1a 100644
--- a/src/openapi/models/ParseKanaBadRequest.ts
+++ b/src/openapi/models/ParseKanaBadRequest.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -27,14 +27,14 @@ export interface ParseKanaBadRequest {
     text: string;
     /**
      * |name|description|
-     * |---|---|
-     * | UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |
-     * | ACCENT_TOP | 句頭にアクセントは置けません: {text} |
-     * | ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |
-     * | ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |
-     * | EMPTY_PHRASE | {position}番目のアクセント句が空白です |
-     * | INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |
-     * | INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |
+|---|---|
+| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |
+| ACCENT_TOP | 句頭にアクセントは置けません: {text} |
+| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |
+| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |
+| EMPTY_PHRASE | {position}番目のアクセント句が空白です |
+| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |
+| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |
      * @type {string}
      * @memberof ParseKanaBadRequest
      */
diff --git a/src/openapi/models/PeriodicData.ts b/src/openapi/models/PeriodicData.ts
new file mode 100644
index 0000000000..9c370d27b1
--- /dev/null
+++ b/src/openapi/models/PeriodicData.ts
@@ -0,0 +1,75 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * VOICEVOX Engine
+ * VOICEVOXの音声合成エンジンです。
+ *
+ * The version of the OpenAPI document: 0.15.0-projects.3
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 周期的なデータの情報
+ * @export
+ * @interface PeriodicData
+ */
+export interface PeriodicData {
+    /**
+     * 
+     * @type {number}
+     * @memberof PeriodicData
+     */
+    rate: number;
+    /**
+     * 
+     * @type {Array<number>}
+     * @memberof PeriodicData
+     */
+    data: Array<number>;
+}
+
+/**
+ * Check if a given object implements the PeriodicData interface.
+ */
+export function instanceOfPeriodicData(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "rate" in value;
+    isInstance = isInstance && "data" in value;
+
+    return isInstance;
+}
+
+export function PeriodicDataFromJSON(json: any): PeriodicData {
+    return PeriodicDataFromJSONTyped(json, false);
+}
+
+export function PeriodicDataFromJSONTyped(json: any, ignoreDiscriminator: boolean): PeriodicData {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'rate': json['rate'],
+        'data': json['data'],
+    };
+}
+
+export function PeriodicDataToJSON(value?: PeriodicData | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'rate': value.rate,
+        'data': value.data,
+    };
+}
+
diff --git a/src/openapi/models/Preset.ts b/src/openapi/models/Preset.ts
index 4a7670ffab..35893a0b73 100644
--- a/src/openapi/models/Preset.ts
+++ b/src/openapi/models/Preset.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/Speaker.ts b/src/openapi/models/Speaker.ts
index d136f63709..28921fb458 100644
--- a/src/openapi/models/Speaker.ts
+++ b/src/openapi/models/Speaker.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SpeakerInfo.ts b/src/openapi/models/SpeakerInfo.ts
index e375fe646b..03b065b1d0 100644
--- a/src/openapi/models/SpeakerInfo.ts
+++ b/src/openapi/models/SpeakerInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SpeakerStyle.ts b/src/openapi/models/SpeakerStyle.ts
index 5d3403cc43..8f9dcd5b4b 100644
--- a/src/openapi/models/SpeakerStyle.ts
+++ b/src/openapi/models/SpeakerStyle.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts b/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts
index 118ff7b686..16393edf17 100644
--- a/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts
+++ b/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SpeakerSupportedFeatures.ts b/src/openapi/models/SpeakerSupportedFeatures.ts
index 604cd1833b..1bcddc5bd5 100644
--- a/src/openapi/models/SpeakerSupportedFeatures.ts
+++ b/src/openapi/models/SpeakerSupportedFeatures.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/StyleInfo.ts b/src/openapi/models/StyleInfo.ts
index c5b72ac96a..afd59111c5 100644
--- a/src/openapi/models/StyleInfo.ts
+++ b/src/openapi/models/StyleInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SupportedDevicesInfo.ts b/src/openapi/models/SupportedDevicesInfo.ts
index 4fef6fbb54..68b80f434f 100644
--- a/src/openapi/models/SupportedDevicesInfo.ts
+++ b/src/openapi/models/SupportedDevicesInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SupportedFeatures.ts b/src/openapi/models/SupportedFeatures.ts
index 00924b2285..c3139cc4bd 100644
--- a/src/openapi/models/SupportedFeatures.ts
+++ b/src/openapi/models/SupportedFeatures.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/UpdateInfo.ts b/src/openapi/models/UpdateInfo.ts
index 6e2154765b..2aece3a334 100644
--- a/src/openapi/models/UpdateInfo.ts
+++ b/src/openapi/models/UpdateInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/UserDictWord.ts b/src/openapi/models/UserDictWord.ts
index 4d2a9c9ace..f030c5dc2c 100644
--- a/src/openapi/models/UserDictWord.ts
+++ b/src/openapi/models/UserDictWord.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/ValidationError.ts b/src/openapi/models/ValidationError.ts
index 28fb693213..794ad02a6a 100644
--- a/src/openapi/models/ValidationError.ts
+++ b/src/openapi/models/ValidationError.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/VvlibManifest.ts b/src/openapi/models/VvlibManifest.ts
index a32ffa3db9..82f3aba942 100644
--- a/src/openapi/models/VvlibManifest.ts
+++ b/src/openapi/models/VvlibManifest.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/WordTypes.ts b/src/openapi/models/WordTypes.ts
index a59aa50cde..4662e8da76 100644
--- a/src/openapi/models/WordTypes.ts
+++ b/src/openapi/models/WordTypes.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -15,8 +15,8 @@
 
 /**
  * 
- *     fastapiでword_type引数を検証する時に使用するクラス
- *     
+    fastapiでword_type引数を検証する時に使用するクラス
+    
  * @export
  */
 export const WordTypes = {
diff --git a/src/openapi/models/index.ts b/src/openapi/models/index.ts
index df0f9356b4..40c0b18431 100644
--- a/src/openapi/models/index.ts
+++ b/src/openapi/models/index.ts
@@ -11,6 +11,7 @@ export * from './LicenseInfo';
 export * from './Mora';
 export * from './MorphableTargetInfo';
 export * from './ParseKanaBadRequest';
+export * from './PeriodicData';
 export * from './Preset';
 export * from './Speaker';
 export * from './SpeakerInfo';
diff --git a/src/openapi/runtime.ts b/src/openapi/runtime.ts
index 648e65834c..e8f15617c9 100644
--- a/src/openapi/runtime.ts
+++ b/src/openapi/runtime.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: latest
+ * The version of the OpenAPI document: 0.15.0-projects.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 3798097cc5..9f81ef11dd 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -33,7 +33,7 @@ import {
   midiToFrequency,
   round,
 } from "@/helpers/singHelper";
-import { AudioQuery } from "@/openapi";
+import { AudioQuery, Mora } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
 
 const ticksToSecondsForConstantBpm = (
@@ -822,6 +822,23 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  UPDATE_PERIODIC_PITCH: {
+    async action({ dispatch }, { audioQuery, engineId, styleId }) {
+      try {
+        const instance = await dispatch("INSTANTIATE_ENGINE_CONNECTOR", {
+          engineId,
+        });
+        return await instance.invoke("periodicPitchPeriodicPitchPost")({
+          audioQuery,
+          speaker: styleId,
+        });
+      } catch (error) {
+        window.electron.logError(error, `Failed to update periodic pitch.`);
+        throw error;
+      }
+    },
+  },
+
   SET_START_RENDERING_REQUESTED: {
     mutation(state, { startRenderingRequested }) {
       state.startRenderingRequested = startRenderingRequested;
@@ -845,9 +862,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
    */
   RENDER: {
     async action({ state, getters, commit, dispatch }) {
-      const preProcessing = (score: Score) => {
-        const resolution = score.resolution;
-        const tempos = score.tempos;
+      const preProcess = (score: Score) => {
         const notes = score.notes;
 
         // 重複するノートを除く
@@ -860,26 +875,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             i--;
           }
         }
-
-        // 長いノートを短くする
-        const maxNoteTime = 0.26;
-        for (let i = 0; i < notes.length; i++) {
-          const note = notes[i];
-          const noteOnPos = note.position;
-          const noteOffPos = note.position + note.duration;
-          const noteOnTime = ticksToSeconds(resolution, tempos, noteOnPos);
-          const noteOffTime = ticksToSeconds(resolution, tempos, noteOffPos);
-
-          if (noteOffTime - noteOnTime > maxNoteTime) {
-            let noteOffPos = secondsToTicks(
-              resolution,
-              tempos,
-              noteOnTime + maxNoteTime
-            );
-            noteOffPos = Math.max(note.position + 1, Math.floor(noteOffPos));
-            note.duration = noteOffPos - note.position;
-          }
-        }
       };
 
       const searchPhrases = async (
@@ -922,13 +917,16 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           throw new Error("Engine not ready.");
         }
 
+        // TODO: 助詞や拗音の扱いはあとで考える
         const text = score.notes
           .map((value) => value.lyric)
-          .map((value) => value.replace("は", "ハ")) // TODO: 助詞の扱いはあとで考える
-          .map((value) => value.replace("へ", "ヘ")) // TODO: 助詞の扱いはあとで考える
+          .map((value) => value.replace("じょ", "ジョ"))
+          .map((value) => value.replace("うぉ", "ウォ"))
+          .map((value) => value.replace("は", "ハ"))
+          .map((value) => value.replace("へ", "ヘ"))
           .join("");
 
-        const query = await dispatch("FETCH_AUDIO_QUERY", {
+        let query = await dispatch("FETCH_AUDIO_QUERY", {
           text,
           engineId: singer.engineId,
           styleId: singer.styleId,
@@ -936,12 +934,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         const moras = query.accentPhrases.map((value) => value.moras).flat();
 
-        if (moras.length !== score.notes.length) {
-          throw new Error(
-            "The number of moras and the number of notes do not match."
-          );
-        }
-
         // 音素を表示
         const phonemes = moras
           .map((value) => {
@@ -955,6 +947,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           .join(" ");
         window.electron.logInfo(`  phonemes: ${phonemes}`);
 
+        if (moras.length !== score.notes.length) {
+          throw new Error(
+            "The number of moras and the number of notes do not match."
+          );
+        }
+
         // クエリを編集
         let noteIndex = 0;
         for (let i = 0; i < query.accentPhrases.length; i++) {
@@ -976,29 +974,60 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             );
 
             // 長さを編集
-            let vowelLength = noteOffTime - noteOnTime;
+            let nextMora: Mora | undefined;
             if (j !== moras.length - 1) {
-              const nextMora = moras[j + 1];
-              if (nextMora.consonantLength !== undefined) {
-                vowelLength -= nextMora.consonantLength;
-              }
+              nextMora = moras[j + 1];
             } else if (i !== query.accentPhrases.length - 1) {
               const nextAccentPhrase = query.accentPhrases[i + 1];
-              const nextMora = nextAccentPhrase.moras[0];
-              if (nextMora.consonantLength !== undefined) {
-                vowelLength -= nextMora.consonantLength;
+              nextMora = nextAccentPhrase.moras[0];
+            }
+            const minVowelLength = 0.01;
+            const minConsonantLength = 0.02;
+            const noteLength = noteOffTime - noteOnTime;
+            if (nextMora && nextMora.consonantLength !== undefined) {
+              // 母音の後ろに子音がある場合
+              mora.vowelLength = noteLength - nextMora.consonantLength;
+              if (mora.vowelLength < minVowelLength) {
+                // 母音をこれ以上短くできない場合は、子音を短くする
+                mora.vowelLength = minVowelLength;
+                nextMora.consonantLength = noteLength - mora.vowelLength;
+                if (nextMora.consonantLength < minConsonantLength) {
+                  // 子音も短くできない場合は、比で母音と子音の長さを決定する
+                  const minMoraLength = minVowelLength + minConsonantLength;
+                  const vowelRatio = minVowelLength / minMoraLength;
+                  const consonantRatio = minConsonantLength / minMoraLength;
+                  mora.vowelLength = noteLength * vowelRatio;
+                  nextMora.consonantLength = noteLength * consonantRatio;
+                }
               }
+            } else {
+              // 母音の後ろに子音がない場合
+              mora.vowelLength = noteLength;
             }
-            mora.vowelLength = Math.max(0.001, vowelLength);
 
             // 音高を編集
             const freq = midiToFrequency(note.midi);
             mora.pitch = Math.log(freq);
 
+            // 無声化を解除
+            if (mora.vowel === "I") {
+              mora.vowel = "i";
+            }
+            if (mora.vowel === "U") {
+              mora.vowel = "u";
+            }
+
             noteIndex++;
           }
         }
 
+        // ピッチを更新
+        query = await dispatch("UPDATE_PERIODIC_PITCH", {
+          audioQuery: query,
+          engineId: singer.engineId,
+          styleId: singer.styleId,
+        });
+
         return query;
       };
 
@@ -1057,7 +1086,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         const score = copyScore(state.score);
         const singer = getSinger();
 
-        preProcessing(score);
+        preProcess(score);
 
         // Score -> Phrases
 
diff --git a/src/store/type.ts b/src/store/type.ts
index d6c0a32049..2d9f2beb6d 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -918,6 +918,14 @@ export type SingingStoreTypes = {
     action(payload: { volume: number }): void;
   };
 
+  UPDATE_PERIODIC_PITCH: {
+    action(payload: {
+      audioQuery: AudioQuery;
+      engineId: EngineId;
+      styleId: StyleId;
+    }): Promise<AudioQuery>;
+  };
+
   SET_START_RENDERING_REQUESTED: {
     mutation: { startRenderingRequested: boolean };
   };

From e1388cf33607a696a5ac7a9ccd34566da2ba4aa0 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Wed, 11 Oct 2023 20:09:33 +0900
Subject: [PATCH 20/59] =?UTF-8?q?[project-s]=20=E3=82=B7=E3=83=BC=E3=82=B1?=
 =?UTF-8?q?=E3=83=B3=E3=82=B5=E3=83=BC=E3=81=AE=E8=A8=88=E7=AE=97=E3=81=AE?=
 =?UTF-8?q?=E6=95=B4=E7=90=86=E3=81=A8=E4=BF=AE=E6=AD=A3=20(#1602)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue | 212 ++++++++++++++-----------
 src/components/Sing/SequencerKeys.vue  |  44 +++--
 src/components/Sing/SequencerNote.vue  |  51 +++---
 src/helpers/singHelper.ts              |  97 ++++++++---
 src/store/singing.ts                   |  14 +-
 src/store/type.ts                      |   2 +-
 tests/unit/store/Vuex.spec.ts          |   2 +-
 7 files changed, 256 insertions(+), 166 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 969a2ecc37..d64dafb62f 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -14,37 +14,40 @@
       <!-- グリッド -->
       <!-- NOTE: 現状小節+オクターブごとの罫線なし -->
       <svg
-        :height="`${sizeY * zoomY * 128}`"
-        :width="`${gridX.length * sizeX * zoomX}`"
+        :width="`${gridCellWidth * gridColumnNum}`"
+        :height="`${gridCellHeight * keyInfos.length}`"
         xmlns="http://www.w3.org/2000/svg"
-        class="sequencer-grids"
+        class="sequencer-grid"
       >
         <!-- パターングリッド -->
         <defs>
           <pattern
-            id="sequencer-grid-16"
-            :width="`${sizeX * zoomX}px`"
-            :height="`${12 * sizeY * zoomY}px`"
+            id="sequencer-grid-column"
+            :width="`${gridCellWidth}px`"
+            :height="`${gridCellHeight * 12}px`"
             patternUnits="userSpaceOnUse"
           >
             <rect
-              v-for="(y, index) in gridY"
+              v-for="(keyInfo, index) in keyInfos"
               :key="index"
               x="0"
-              :y="`${sizeY * zoomY * index}`"
-              :width="`${sizeX * zoomX}`"
-              :height="`${sizeY * zoomY}`"
-              :class="`sequencer-grids-col sequencer-grids-col-${y.color}`"
+              :y="`${gridCellHeight * index}`"
+              :width="`${gridCellWidth}`"
+              :height="`${gridCellHeight}`"
+              :class="`sequencer-grid-cell sequencer-grid-cell-${keyInfo.color}`"
             />
           </pattern>
-          <!-- NOTE: 4/4 1小節でグリッド見た目確認目的 -->
           <pattern
             id="sequencer-grid-measure"
-            :width="`${sizeX * 16 * zoomX}`"
-            :height="`${12 * sizeY * zoomY}`"
+            :width="`${gridCellWidth * gridColumnNumPerMeasure}`"
+            :height="`${gridCellHeight * 12}`"
             patternUnits="userSpaceOnUse"
           >
-            <rect width="100%" height="100%" fill="url(#sequencer-grid-16)" />
+            <rect
+              width="100%"
+              height="100%"
+              fill="url(#sequencer-grid-column)"
+            />
             <line
               x="100%"
               x2="0"
@@ -117,14 +120,20 @@
 import { defineComponent, computed, ref, onMounted } from "vue";
 import { v4 as uuidv4 } from "uuid";
 import { useStore } from "@/store";
+import { TimeSignature } from "@/store/type";
 import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
 import SequencerNote from "@/components/Sing/SequencerNote.vue";
 import {
-  midiKeys,
-  getPitchFromMidi,
-  getDoremiFromMidi,
-  BASE_GRID_SIZE_X as sizeX,
-  BASE_GRID_SIZE_Y as sizeY,
+  getMeasureDuration,
+  getMeasureNum,
+  getNoteDuration,
+  getKeyBaseHeight,
+  tickToBaseX,
+  baseXToTick,
+  noteNumberToBaseY,
+  baseYToNoteNumber,
+  keyInfos,
+  getDoremiFromNoteNumber,
 } from "@/helpers/singHelper";
 
 export default defineComponent({
@@ -152,63 +161,86 @@ export default defineComponent({
     const dragMoveCurrentX = ref();
     const dragMoveCurrentY = ref();
     const dragDurationCurrentX = ref();
-    // シーケンサグリッド
-    const gridY = midiKeys;
-    const gridX = computed(() => {
-      const resolution = state.score?.resolution || 480;
-      // NOTE: 最低長: 仮32小節...MIDI長さ(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
-      const minDuration = resolution * 4 * 32;
-      const lastNote = state.score?.notes.slice(-1)[0];
-      // Score長さ: スコア長もしくは最低長のうち長い方
-      const totalDuration = lastNote
-        ? Math.max(lastNote.position + lastNote.duration, minDuration)
-        : minDuration;
-      // グリッド幅1/16
-      const gridDuration = resolution / 4;
-      // NOTE: いったん最後尾に足した場合は伸びるようにする
-      const gridsMax = Math.ceil(totalDuration / gridDuration) + 16;
-      return [...Array(gridsMax).keys()].map(
-        (gridNum) => gridNum * gridDuration
-      );
-    });
+    // 分解能（Ticks Per Quarter Note）
+    const tpqn = computed(() => state.score?.resolution ?? 480);
     // ノート
-    const notes = computed(() => state.score?.notes);
-    // 表紙
-    const timeSignatures = computed(() => state.score?.timeSignatures);
+    const notes = computed(() => state.score?.notes ?? []);
+    // 拍子
+    const defaultTimeSignature: TimeSignature = {
+      position: 0,
+      beats: 4,
+      beatType: 4,
+    };
+    const timeSignature = computed(() => {
+      return state.score?.timeSignatures?.[0] ?? defaultTimeSignature;
+    });
     // ズーム状態
     const zoomX = computed(() => state.sequencerZoomX);
     const zoomY = computed(() => state.sequencerZoomY);
-    // スナップサイズ
-    const snapSize = computed(() => state.sequencerSnapSize);
-    const snapWidth = computed(() => (snapSize.value / 4) * zoomX.value);
-    // グリッドサイズ
-    const gridWidth = computed(() => sizeX * zoomX.value);
-    const gridHeight = computed(() => sizeY * zoomY.value);
+    // スナップ
+    const snapTicks = computed(() => {
+      return getNoteDuration(state.sequencerSnapType, tpqn.value);
+    });
+    const snapBaseWidth = computed(() => {
+      return tickToBaseX(snapTicks.value, tpqn.value);
+    });
+    const snapWidth = computed(() => {
+      return snapBaseWidth.value * zoomX.value;
+    });
+    // シーケンサグリッド
+    const gridCellTicks = snapTicks; // ひとまずスナップ幅＝グリッドセル幅
+    const gridCellBaseWidth = snapBaseWidth;
+    const gridCellWidth = computed(() => {
+      return gridCellBaseWidth.value * zoomX.value;
+    });
+    const gridCellBaseHeight = getKeyBaseHeight();
+    const gridCellHeight = computed(() => {
+      return gridCellBaseHeight * zoomY.value;
+    });
+    const measureDuration = computed(() => {
+      return getMeasureDuration(timeSignature.value, tpqn.value);
+    });
+    const gridColumnNumPerMeasure = computed(() => {
+      // TODO: スナップが3連符のときにおかしくなるので修正する
+      return Math.round(measureDuration.value / gridCellTicks.value);
+    });
+    const gridColumnNum = computed(() => {
+      // NOTE: 最低長: 仮32小節...スコア長(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
+      const minMeasureNum = 32;
+      const measureNum = Math.max(
+        minMeasureNum,
+        getMeasureNum(notes.value, measureDuration.value)
+      );
+      // NOTE: いったん最後尾に足した場合は伸びるようにする
+      return gridColumnNumPerMeasure.value * (measureNum + 1);
+    });
     // スクロール位置
     // const scrollX = computed(() => state.sequencerScrollX);
-    const scrollY = computed(() => state.sequencerScrollY);
+    // const scrollY = computed(() => state.sequencerScrollY);
     const selectedNoteIds = computed(() => state.selectedNoteIds);
 
     // ノートの追加
     const addNote = (event: MouseEvent) => {
-      const resolution = state.score?.resolution;
-      const gridXSize = resolution ? resolution / 4 : snapSize.value;
-      const position =
-        gridXSize * Math.floor(event.offsetX / (sizeX * zoomX.value));
-      const midi = 127 - Math.floor(event.offsetY / (sizeY * zoomY.value));
-      if (0 > midi) {
+      const eventOffsetBaseX = event.offsetX / zoomX.value;
+      const eventOffsetBaseY = event.offsetY / zoomY.value;
+      const positionBaseX =
+        gridCellBaseWidth.value *
+        Math.floor(eventOffsetBaseX / gridCellBaseWidth.value);
+      const position = baseXToTick(positionBaseX, tpqn.value);
+      const noteNumber = baseYToNoteNumber(eventOffsetBaseY);
+      if (noteNumber < 0) {
         return;
       }
       // NOTE: ノートの追加は1/8をベース
-      const duration = gridXSize * 2;
-      const lyric = getDoremiFromMidi(midi);
+      const duration = getNoteDuration(8, tpqn.value);
+      const lyric = getDoremiFromNoteNumber(noteNumber);
       // NOTE: 仮ID
       const id = uuidv4();
       store.dispatch("ADD_NOTE", {
         note: {
           id,
           position,
-          midi,
+          midi: noteNumber,
           duration,
           lyric,
         },
@@ -257,23 +289,23 @@ export default defineComponent({
 
       // カーソル位置に応じてノート移動量を計算
       let amountPositionX = 0;
-      if (gridWidth.value <= Math.abs(distanceX)) {
-        amountPositionX = 0 < distanceX ? snapSize.value : -snapSize.value;
+      if (gridCellWidth.value <= Math.abs(distanceX)) {
+        amountPositionX = 0 < distanceX ? snapTicks.value : -snapTicks.value;
         const dragMoveCurrentXNext =
           dragMoveCurrentX.value +
-          (0 < amountPositionX ? gridWidth.value : -gridWidth.value);
+          (0 < amountPositionX ? gridCellWidth.value : -gridCellWidth.value);
         dragMoveCurrentX.value = dragMoveCurrentXNext;
       }
       let amountPositionY = 0;
-      if (gridHeight.value <= Math.abs(distanceY)) {
+      if (gridCellHeight.value <= Math.abs(distanceY)) {
         amountPositionY = 0 < distanceY ? -1 : 1;
         const dragMoveCurrentYNext =
           dragMoveCurrentY.value +
-          (0 > amountPositionY ? gridHeight.value : -gridHeight.value);
+          (0 > amountPositionY ? gridCellHeight.value : -gridCellHeight.value);
         dragMoveCurrentY.value = dragMoveCurrentYNext;
       }
 
-      // 選択中のノートのpositionとmidiを変更
+      // 選択中のノートのpositionとnoteNumberを変更
       let isNotesChanged = false;
       const newNotes = [...state.score.notes].map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
@@ -282,10 +314,10 @@ export default defineComponent({
           }
           isNotesChanged = true;
           const position = note.position + amountPositionX;
-          const midi = note.midi + amountPositionY;
+          const noteNumber = note.midi + amountPositionY;
           return {
             ...note,
-            midi,
+            midi: noteNumber,
             position,
           };
         } else {
@@ -333,8 +365,8 @@ export default defineComponent({
           if (selectedNoteIds.value.includes(note.id)) {
             const duration =
               note.duration +
-              (0 < distanceX ? snapSize.value : -snapSize.value);
-            if (duration < Math.max(snapSize.value, 0) || note.position < 0) {
+              (0 < distanceX ? snapTicks.value : -snapTicks.value);
+            if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
               return note;
             } else {
               isNotesChanged = true;
@@ -385,11 +417,11 @@ export default defineComponent({
           if (selectedNoteIds.value.includes(note.id)) {
             const position =
               note.position +
-              (0 < distanceX ? snapSize.value : -snapSize.value);
+              (0 < distanceX ? snapTicks.value : -snapTicks.value);
             const duration =
               note.duration +
-              (0 > distanceX ? snapSize.value : -snapSize.value);
-            if (duration < Math.max(snapSize.value, 0) || note.position < 0) {
+              (0 > distanceX ? snapTicks.value : -snapTicks.value);
+            if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
               return note;
             } else {
               isNotesChanged = true;
@@ -451,10 +483,10 @@ export default defineComponent({
       }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
-          const midi = Math.min(note.midi + 1, 127);
+          const noteNumber = Math.min(note.midi + 1, 127);
           return {
             ...note,
-            midi,
+            midi: noteNumber,
           };
         } else {
           return note;
@@ -472,10 +504,10 @@ export default defineComponent({
       }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
-          const midi = Math.max(note.midi - 1, 0);
+          const noteNumber = Math.max(note.midi - 1, 0);
           return {
             ...note,
-            midi,
+            midi: noteNumber,
           };
         } else {
           return note;
@@ -493,7 +525,7 @@ export default defineComponent({
       }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
-          const position = note.position + snapSize.value;
+          const position = note.position + snapTicks.value;
           return {
             ...note,
             position,
@@ -511,7 +543,7 @@ export default defineComponent({
       }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
-          const position = note.position - snapSize.value;
+          const position = note.position - snapTicks.value;
           return {
             ...note,
             position,
@@ -557,24 +589,26 @@ export default defineComponent({
 
     onMounted(() => {
       const el = document.querySelector("#score-sequencer");
-      // C4あたりにスクロールする
+      // 上から2/3の位置がC4になるようにスクロールする
       if (el) {
-        el.scrollTop = scrollY.value * (sizeY * zoomY.value);
+        const c4BaseY = noteNumberToBaseY(60);
+        const clientBaseHeight = el.clientHeight / zoomY.value;
+        const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
+        el.scrollTop = scrollBaseY * zoomY.value;
       }
     });
 
     return {
-      timeSignatures,
-      gridY,
-      gridX,
+      gridCellWidth,
+      gridCellHeight,
+      gridColumnNumPerMeasure,
+      gridColumnNum,
+      keyInfos,
       notes,
       zoomX,
       zoomY,
-      sizeX,
-      sizeY,
       cursorX,
       cursorY,
-      getPitchFromMidi,
       setZoomX,
       setZoomY,
       addNote,
@@ -619,21 +653,21 @@ export default defineComponent({
   padding-bottom: 164px;
 }
 
-.sequencer-grids {
+.sequencer-grid {
   display: block;
 }
 
-.sequencer-grids-col {
+.sequencer-grid-cell {
   display: block;
   stroke: #e8e8e8;
   stroke-width: 1;
 }
 
-.sequencer-grids-col-white {
+.sequencer-grid-cell-white {
   fill: #fff;
 }
 
-.sequencer-grids-col-black {
+.sequencer-grid-cell-black {
   fill: #f2f2f2;
 }
 
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index cdac074d39..7cc6bb60f2 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -1,37 +1,37 @@
 <template>
   <svg
     width="48"
-    :height="`${sizeY * zoomY * 128}`"
+    :height="`${keyHeight * keyInfos.length}`"
     xmlns="http://www.w3.org/2000/svg"
     class="sequencer-keys"
   >
-    <g v-for="(y, index) in gridY" :key="index">
+    <g v-for="(keyInfo, index) in keyInfos" :key="index">
       <rect
         x="0"
-        :y="`${sizeY * zoomY * index}`"
-        :width="`${y.color === 'black' ? 30 : 48}`"
-        :height="`${sizeY * zoomY}`"
-        :class="`sequencer-keys-item-${y.color}`"
-        :title="y.name"
+        :y="`${keyHeight * index}`"
+        :width="`${keyInfo.color === 'black' ? 30 : 48}`"
+        :height="`${keyHeight}`"
+        :class="`sequencer-keys-item-${keyInfo.color}`"
+        :title="keyInfo.name"
       />
       <line
-        v-if="y.pitch === 'C' || y.pitch === 'F'"
+        v-if="keyInfo.pitch === 'C' || keyInfo.pitch === 'F'"
         x1="0"
         x2="48"
-        :y1="`${(index + 1) * sizeY * zoomY}`"
-        :y2="`${(index + 1) * sizeY * zoomY}`"
+        :y1="`${(index + 1) * keyHeight}`"
+        :y2="`${(index + 1) * keyHeight}`"
         :class="`sequencer-keys-item-separator ${
-          y.pitch === 'C' && 'sequencer-keys-item-separator-octave'
-        } ${y.pitch === 'F' && 'sequencer-keys-item-separator-f'}`"
+          keyInfo.pitch === 'C' && 'sequencer-keys-item-separator-octave'
+        } ${keyInfo.pitch === 'F' && 'sequencer-keys-item-separator-f'}`"
       />
       <text
-        v-if="y.pitch === 'C'"
+        v-if="keyInfo.pitch === 'C'"
         font-size="10"
         x="32"
-        :y="`${sizeY * zoomY * (index + 1) - 4}`"
+        :y="`${keyHeight * (index + 1) - 4}`"
         class="sequencer-keys-item-pitchname"
       >
-        {{ y.name }}
+        {{ keyInfo.name }}
       </text>
     </g>
   </svg>
@@ -40,25 +40,21 @@
 <script lang="ts">
 import { defineComponent, computed } from "vue";
 import { useStore } from "@/store";
-import {
-  midiKeys,
-  BASE_GRID_SIZE_X as sizeX,
-  BASE_GRID_SIZE_Y as sizeY,
-} from "@/helpers/singHelper";
+import { keyInfos, getKeyBaseHeight } from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingSequencerKeys",
   setup() {
     const store = useStore();
-    const gridY = midiKeys;
     const zoomX = computed(() => store.state.sequencerZoomX);
     const zoomY = computed(() => store.state.sequencerZoomY);
+    const keyBaseHeight = getKeyBaseHeight();
+    const keyHeight = computed(() => keyBaseHeight * zoomY.value);
     return {
-      gridY,
-      sizeX,
-      sizeY,
+      keyInfos,
       zoomX,
       zoomY,
+      keyHeight,
     };
   },
 });
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index a260c04eb6..b0c9246849 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -19,7 +19,7 @@
       class="sequencer-note-bar"
       focusable="true"
       tabindex="0"
-      @dblclick.prevent="removeNote"
+      @dblclick.prevent.stop="removeNote"
       @keydown.prevent="handleKeydown"
     >
       <g>
@@ -43,8 +43,8 @@
         />
         <rect
           y="-25%"
-          :x="`${(note.duration / 4) * zoomX - 4}`"
-          width="16"
+          :x="`${barWidth - 4}`"
+          width="12"
           height="150%"
           fill-opacity="0"
           class="sequencer-note-bar-draghandle"
@@ -60,8 +60,9 @@ import { defineComponent, computed, PropType } from "vue";
 import { useStore } from "@/store";
 import { Note } from "@/store/type";
 import {
-  BASE_GRID_SIZE_X as sizeX,
-  BASE_GRID_SIZE_Y as sizeY,
+  getKeyBaseHeight,
+  tickToBaseX,
+  noteNumberToBaseY,
 } from "@/helpers/singHelper";
 
 export default defineComponent({
@@ -82,16 +83,28 @@ export default defineComponent({
 
   setup(props, { emit }) {
     const store = useStore();
-    const zoomX = computed(() => store.state.sequencerZoomX);
-    const zoomY = computed(() => store.state.sequencerZoomY);
-    const positionX = computed(() => (props.note.position / 4) * zoomX.value);
-    const positionY = computed(
-      () => (127 - props.note.midi) * sizeY * zoomY.value
-    );
-    const barHeight = computed(() => sizeY * zoomY.value);
-    const barWidth = computed(() => (props.note.duration / 4) * zoomX.value);
+    const state = store.state;
+    const tpqn = computed(() => state.score?.resolution ?? 480);
+    const zoomX = computed(() => state.sequencerZoomX);
+    const zoomY = computed(() => state.sequencerZoomY);
+    const positionX = computed(() => {
+      const noteStartTicks = props.note.position;
+      return tickToBaseX(noteStartTicks, tpqn.value) * zoomX.value;
+    });
+    const positionY = computed(() => {
+      const noteNumber = props.note.midi;
+      return noteNumberToBaseY(noteNumber + 0.5) * zoomY.value;
+    });
+    const barHeight = computed(() => getKeyBaseHeight() * zoomY.value);
+    const barWidth = computed(() => {
+      const noteStartTicks = props.note.position;
+      const noteEndTicks = props.note.position + props.note.duration;
+      const noteStartBaseX = tickToBaseX(noteStartTicks, tpqn.value);
+      const noteEndBaseX = tickToBaseX(noteEndTicks, tpqn.value);
+      return (noteEndBaseX - noteStartBaseX) * zoomX.value;
+    });
     const isSelected = computed(() => {
-      return store.state.selectedNoteIds.includes(props.note.id);
+      return state.selectedNoteIds.includes(props.note.id);
     });
 
     const removeNote = () => {
@@ -118,8 +131,8 @@ export default defineComponent({
     };
 
     const handleMouseDown = (event: MouseEvent) => {
-      if (!store.state.selectedNoteIds.includes(props.note.id)) {
-        const noteIds = [...store.state.selectedNoteIds, props.note.id];
+      if (!state.selectedNoteIds.includes(props.note.id)) {
+        const noteIds = [...state.selectedNoteIds, props.note.id];
         store.dispatch("SET_SELECTED_NOTE_IDS", {
           noteIds,
         });
@@ -129,7 +142,7 @@ export default defineComponent({
     };
 
     const handleDragRightStart = (event: MouseEvent) => {
-      const noteIds = [...store.state.selectedNoteIds, props.note.id];
+      const noteIds = [...state.selectedNoteIds, props.note.id];
       store.dispatch("SET_SELECTED_NOTE_IDS", {
         noteIds,
       });
@@ -137,7 +150,7 @@ export default defineComponent({
     };
 
     const handleDragLeftStart = (event: MouseEvent) => {
-      const noteIds = [...store.state.selectedNoteIds, props.note.id];
+      const noteIds = [...state.selectedNoteIds, props.note.id];
       store.dispatch("SET_SELECTED_NOTE_IDS", {
         noteIds,
       });
@@ -145,8 +158,6 @@ export default defineComponent({
     };
 
     return {
-      sizeX,
-      sizeY,
       zoomX,
       zoomY,
       positionX,
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index c0855b302e..d3f32a872a 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -1,5 +1,61 @@
-export function getPitchFromMidi(midi: number): string {
-  const mapPitches: Array<string> = [
+import { Note, TimeSignature } from "@/store/type";
+
+const BASE_X_PER_QUARTER_NOTE = 120;
+const BASE_Y_PER_NOTE_NUMBER = 30;
+
+export function noteNumberToFrequency(noteNumber: number) {
+  return 440 * 2 ** ((noteNumber - 69) / 12);
+}
+
+// NOTE: 戻り値の単位はtick
+export function getMeasureDuration(timeSignature: TimeSignature, tpqn: number) {
+  const beats = timeSignature.beats;
+  const beatType = timeSignature.beatType;
+  const quarterNotesPerMeasure = (4 / beatType) * beats;
+  return tpqn * quarterNotesPerMeasure;
+}
+
+export function getMeasureNum(notes: Note[], measureDuration: number) {
+  if (notes.length === 0) {
+    return 0;
+  }
+  const lastNote = notes[notes.length - 1];
+  const maxTicks = lastNote.position + lastNote.duration;
+  return Math.ceil(maxTicks / measureDuration);
+}
+
+// NOTE: 戻り値の単位はtick
+export function getNoteDuration(noteType: number, tpqn: number) {
+  return (tpqn * 4) / noteType;
+}
+
+export function getKeyBaseHeight() {
+  return BASE_Y_PER_NOTE_NUMBER;
+}
+
+export function tickToBaseX(ticks: number, tpqn: number) {
+  return (ticks / tpqn) * BASE_X_PER_QUARTER_NOTE;
+}
+
+export function baseXToTick(baseX: number, tpqn: number) {
+  return (baseX / BASE_X_PER_QUARTER_NOTE) * tpqn;
+}
+
+// NOTE: ノート番号が整数のときに、そのノート番号のキーの中央の位置を返します
+export function noteNumberToBaseY(noteNumber: number) {
+  return (127.5 - noteNumber) * BASE_Y_PER_NOTE_NUMBER;
+}
+
+// NOTE: integerがfalseの場合は、ノート番号のキーの中央の位置が
+//       ちょうどそのノート番号となるように計算します
+export function baseYToNoteNumber(baseY: number, integer = true) {
+  return integer
+    ? 127 - Math.floor(baseY / BASE_Y_PER_NOTE_NUMBER)
+    : 127.5 - baseY / BASE_Y_PER_NOTE_NUMBER;
+}
+
+export function getPitchFromNoteNumber(noteNumber: number) {
+  const mapPitches = [
     "C",
     "C#",
     "D",
@@ -13,12 +69,12 @@ export function getPitchFromMidi(midi: number): string {
     "A#",
     "B",
   ];
-  const pitchPos = midi % 12;
+  const pitchPos = noteNumber % 12;
   return mapPitches[pitchPos];
 }
 
-export function getDoremiFromMidi(midi: number): string {
-  const mapPitches: Array<string> = [
+export function getDoremiFromNoteNumber(noteNumber: number) {
+  const mapPitches = [
     "ド",
     "ド",
     "レ",
@@ -32,28 +88,28 @@ export function getDoremiFromMidi(midi: number): string {
     "ラ",
     "シ",
   ];
-  const pitchPos = midi % 12;
+  const pitchPos = noteNumber % 12;
   return mapPitches[pitchPos];
 }
 
-export function getOctaveFromMidi(midi: number): number {
-  return Math.floor(midi / 12) - 1;
+export function getOctaveFromNoteNumber(noteNumber: number) {
+  return Math.floor(noteNumber / 12) - 1;
 }
 
-export function getKeyColorFromMidi(midi: number): string {
-  const mapWhiteKeys: Array<string> = ["C", "D", "E", "F", "G", "A", "B"];
-  const pitch = getPitchFromMidi(midi);
+export function getKeyColorFromNoteNumber(noteNumber: number) {
+  const mapWhiteKeys = ["C", "D", "E", "F", "G", "A", "B"];
+  const pitch = getPitchFromNoteNumber(noteNumber);
   return mapWhiteKeys.includes(pitch) ? "white" : "black";
 }
 
-export const midiKeys = [...Array(128)]
-  .map((_, midi) => {
-    const pitch = getPitchFromMidi(midi);
-    const octave = getOctaveFromMidi(midi);
+export const keyInfos = [...Array(128)]
+  .map((_, noteNumber) => {
+    const pitch = getPitchFromNoteNumber(noteNumber);
+    const octave = getOctaveFromNoteNumber(noteNumber);
     const name = `${pitch}${octave}`;
-    const color = getKeyColorFromMidi(midi);
+    const color = getKeyColorFromNoteNumber(noteNumber);
     return {
-      midi,
+      noteNumber,
       pitch,
       octave,
       name,
@@ -62,14 +118,7 @@ export const midiKeys = [...Array(128)]
   })
   .reverse();
 
-export const BASE_GRID_SIZE_X = 30;
-export const BASE_GRID_SIZE_Y = 30;
-
 export function round(value: number, digits: number) {
   const powerOf10 = 10 ** digits;
   return Math.round(value * powerOf10) / powerOf10;
 }
-
-export function midiToFrequency(midi: number) {
-  return 440 * 2 ** ((midi - 69) / 12);
-}
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 9f81ef11dd..612491239c 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -29,8 +29,8 @@ import {
 } from "@/infrastructures/AudioRenderer";
 import { EngineId, StyleId } from "@/type/preload";
 import {
-  getDoremiFromMidi,
-  midiToFrequency,
+  getDoremiFromNoteNumber,
+  noteNumberToFrequency,
   round,
 } from "@/helpers/singHelper";
 import { AudioQuery, Mora } from "@/openapi";
@@ -275,9 +275,9 @@ export const singingStoreState: SingingStoreState = {
   isShowSinger: true,
   sequencerZoomX: 0.5,
   sequencerZoomY: 0.75,
-  sequencerScrollY: 60, // Y軸 midi number
-  sequencerScrollX: 0, // X軸 midi duration(仮)
-  sequencerSnapSize: 120, // スナップサイズ 試行用で1/18(ppq=480)のmidi durationで固定
+  sequencerScrollY: 60, // Y軸 note number
+  sequencerScrollX: 0, // X軸 tick(仮)
+  sequencerSnapType: 16, // スナップタイプ 試行用で1/16で固定
   selectedNoteIds: [], // 選択中のノート
   nowPlaying: false,
   volume: 0,
@@ -1006,7 +1006,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             }
 
             // 音高を編集
-            const freq = midiToFrequency(note.midi);
+            const freq = noteNumberToFrequency(note.midi);
             mora.pitch = Math.log(freq);
 
             // 無声化を解除
@@ -1312,7 +1312,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               note.durationTicks
             ),
             midi: note.midi,
-            lyric: getDoremiFromMidi(note.midi),
+            lyric: getDoremiFromNoteNumber(note.midi),
           }))
           .sort((a, b) => a.position - b.position)
           .forEach((note) => {
diff --git a/src/store/type.ts b/src/store/type.ts
index 2d9f2beb6d..658cda2791 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -751,7 +751,7 @@ export type SingingStoreState = {
   sequencerZoomY: number;
   sequencerScrollX: number;
   sequencerScrollY: number;
-  sequencerSnapSize: number;
+  sequencerSnapType: number;
   selectedNoteIds: string[];
   nowPlaying: boolean;
   volume: number;
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index b0f7d8fd87..22c2a9afad 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -153,7 +153,7 @@ describe("store/vuex.js test", () => {
         sequencerZoomY: 1,
         sequencerScrollX: 0,
         sequencerScrollY: 60,
-        sequencerSnapSize: 120,
+        sequencerSnapType: 16,
         selectedNoteIds: [],
         nowPlaying: false,
         volume: 0,

From 1aa007d0bf7d14ffbaab0ed20bbf00bd3d4a9b02 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 15 Oct 2023 02:21:05 +0900
Subject: [PATCH 21/59] =?UTF-8?q?[project-s]=20=E6=8B=8D=E3=81=AE=E7=B7=9A?=
 =?UTF-8?q?=E3=82=92=E6=8F=8F=E7=94=BB=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1607)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue | 83 +++++++++++++++++---------
 1 file changed, 56 insertions(+), 27 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index d64dafb62f..cc049378e8 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -22,10 +22,10 @@
         <!-- パターングリッド -->
         <defs>
           <pattern
-            id="sequencer-grid-column"
-            :width="`${gridCellWidth}px`"
-            :height="`${gridCellHeight * 12}px`"
+            id="sequencer-grid-octave-cells"
             patternUnits="userSpaceOnUse"
+            :width="`${gridCellWidth}`"
+            :height="`${gridCellHeight * 12}`"
           >
             <rect
               v-for="(keyInfo, index) in keyInfos"
@@ -39,28 +39,38 @@
           </pattern>
           <pattern
             id="sequencer-grid-measure"
-            :width="`${gridCellWidth * gridColumnNumPerMeasure}`"
-            :height="`${gridCellHeight * 12}`"
             patternUnits="userSpaceOnUse"
+            :width="`${beatWidth * beatsPerMeasure}`"
+            :height="`${gridCellHeight * keyInfos.length}`"
           >
-            <rect
-              width="100%"
-              height="100%"
-              fill="url(#sequencer-grid-column)"
+            <line
+              v-for="n in beatsPerMeasure"
+              :key="n"
+              :x1="`${beatWidth * (n - 1)}`"
+              :x2="`${beatWidth * (n - 1)}`"
+              y1="0"
+              y2="100%"
+              stroke-width="1"
+              :class="`sequencer-grid-${n === 1 ? 'measure' : 'beat'}-line`"
             />
             <line
-              x="100%"
-              x2="0"
+              :x1="`${beatWidth * beatsPerMeasure}`"
+              :x2="`${beatWidth * beatsPerMeasure}`"
               y1="0"
               y2="100%"
               stroke-width="1"
-              fill="none"
-              class="sequencer-grid-separator-line"
+              :class="`sequencer-grid-measure-line`"
             />
           </pattern>
         </defs>
         <rect
-          id="sequencer-grid"
+          x="0"
+          y="0"
+          width="100%"
+          height="100%"
+          fill="url(#sequencer-grid-octave-cells)"
+        />
+        <rect
           x="0"
           y="0"
           width="100%"
@@ -174,6 +184,17 @@ export default defineComponent({
     const timeSignature = computed(() => {
       return state.score?.timeSignatures?.[0] ?? defaultTimeSignature;
     });
+    // 小節数
+    const measureNum = computed(() => {
+      // NOTE: 最低長: 仮32小節...スコア長(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
+      const minMeasureNum = 32;
+      const measureNum = Math.max(
+        minMeasureNum,
+        getMeasureNum(notes.value, measureDuration.value)
+      );
+      // NOTE: いったん最後尾に足した場合は伸びるようにする
+      return measureNum + 1;
+    });
     // ズーム状態
     const zoomX = computed(() => state.sequencerZoomX);
     const zoomY = computed(() => state.sequencerZoomY);
@@ -200,19 +221,20 @@ export default defineComponent({
     const measureDuration = computed(() => {
       return getMeasureDuration(timeSignature.value, tpqn.value);
     });
-    const gridColumnNumPerMeasure = computed(() => {
-      // TODO: スナップが3連符のときにおかしくなるので修正する
-      return Math.round(measureDuration.value / gridCellTicks.value);
-    });
     const gridColumnNum = computed(() => {
-      // NOTE: 最低長: 仮32小節...スコア長(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
-      const minMeasureNum = 32;
-      const measureNum = Math.max(
-        minMeasureNum,
-        getMeasureNum(notes.value, measureDuration.value)
+      const gridColumnNumPerMeasure = Math.round(
+        measureDuration.value / gridCellTicks.value
       );
-      // NOTE: いったん最後尾に足した場合は伸びるようにする
-      return gridColumnNumPerMeasure.value * (measureNum + 1);
+      return gridColumnNumPerMeasure * measureNum.value;
+    });
+    const beatsPerMeasure = computed(() => {
+      return timeSignature.value.beats;
+    });
+    const beatWidth = computed(() => {
+      const beatType = timeSignature.value.beatType;
+      const quarterNotesPerBeat = 4 / beatType;
+      const beatTicks = tpqn.value * quarterNotesPerBeat;
+      return tickToBaseX(beatTicks, tpqn.value) * zoomX.value;
     });
     // スクロール位置
     // const scrollX = computed(() => state.sequencerScrollX);
@@ -599,9 +621,11 @@ export default defineComponent({
     });
 
     return {
+      measureNum,
+      beatsPerMeasure,
+      beatWidth,
       gridCellWidth,
       gridCellHeight,
-      gridColumnNumPerMeasure,
       gridColumnNum,
       keyInfos,
       notes,
@@ -671,8 +695,13 @@ export default defineComponent({
   fill: #f2f2f2;
 }
 
-.sequencer-grid-separator-line {
+.sequencer-grid-measure-line {
   backface-visibility: hidden;
   stroke: #b0b0b0;
 }
+
+.sequencer-grid-beat-line {
+  backface-visibility: hidden;
+  stroke: #d0d0d0;
+}
 </style>

From d7a28d39b9407e01f82296f6a90651c5f625dd35 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 16 Oct 2023 03:20:06 +0900
Subject: [PATCH 22/59] =?UTF-8?q?[project-s]=20=E3=82=B9=E3=83=8A=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1609)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue |  5 ++-
 src/components/Sing/ToolBar.vue        | 51 ++++++++++++++++++++++++--
 src/helpers/singHelper.ts              | 32 ++++++++++++++++
 src/store/singing.ts                   | 14 +++++++
 src/store/type.ts                      |  5 +++
 5 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index cc049378e8..0d3f03afb1 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -253,8 +253,9 @@ export default defineComponent({
       if (noteNumber < 0) {
         return;
       }
-      // NOTE: ノートの追加は1/8をベース
-      const duration = getNoteDuration(8, tpqn.value);
+      // NOTE: ノートの長さはスナップをベース（最小の長さは1/8）
+      const noteType = Math.min(8, state.sequencerSnapType);
+      const duration = getNoteDuration(noteType, tpqn.value);
       const lyric = getDoremiFromNoteNumber(noteNumber);
       // NOTE: 仮ID
       const id = uuidv4();
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index c65a010c5b..d70d571d6b 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -74,9 +74,18 @@
     </div>
     <div class="sing-setting">
       <q-slider v-model.number="volume" class="sing-volume" />
-      <select class="sing-snap">
-        <option>1/16</option>
-      </select>
+      <q-select
+        v-model="snapTypeSelectModel"
+        :options="snapTypeSelectOptions"
+        color="primary"
+        text-color="display-on-primary"
+        outlined
+        dense
+        options-dense
+        transition-show="none"
+        transition-hide="none"
+        class="sing-snap"
+      />
     </div>
   </div>
 </template>
@@ -84,6 +93,7 @@
 <script lang="ts">
 import { defineComponent, computed, watch, ref } from "vue";
 import { useStore } from "@/store";
+import { getSnapTypes, isTriplet } from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingToolBar",
@@ -238,6 +248,32 @@ export default defineComponent({
       },
     });
 
+    const snapTypeSelectOptions = computed(() => {
+      const tpqn = store.state.score?.resolution ?? 480;
+      return getSnapTypes(tpqn).map((snapType) => {
+        if (isTriplet(snapType)) {
+          return { snapType, label: `1/${(snapType / 3) * 2}（三連符）` };
+        } else {
+          return { snapType, label: `1/${snapType}` };
+        }
+      });
+    });
+    const snapTypeSelectModel = computed({
+      get() {
+        const snapType = store.state.sequencerSnapType;
+        const selectOptions = snapTypeSelectOptions.value;
+        return (
+          selectOptions.find((value) => value.snapType === snapType) ??
+          selectOptions[selectOptions.length - 1]
+        );
+      },
+      set(value) {
+        store.dispatch("SET_SNAP_TYPE", {
+          snapType: value.snapType,
+        });
+      },
+    });
+
     return {
       isShowSinger,
       toggleShowSinger,
@@ -256,6 +292,8 @@ export default defineComponent({
       stop,
       seek,
       volume,
+      snapTypeSelectOptions,
+      snapTypeSelectModel,
     };
   },
 });
@@ -336,7 +374,12 @@ export default defineComponent({
 }
 
 .sing-volume {
-  margin-right: 10px;
+  margin-right: 16px;
   width: 72px;
 }
+
+.sing-snap {
+  margin-right: 2px;
+  min-width: 160px;
+}
 </style>
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index d3f32a872a..fb7dc7228c 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -15,6 +15,7 @@ export function getMeasureDuration(timeSignature: TimeSignature, tpqn: number) {
   return tpqn * quarterNotesPerMeasure;
 }
 
+// TODO: getNumOfMeasuresに変更する
 export function getMeasureNum(notes: Note[], measureDuration: number) {
   if (notes.length === 0) {
     return 0;
@@ -29,6 +30,29 @@ export function getNoteDuration(noteType: number, tpqn: number) {
   return (tpqn * 4) / noteType;
 }
 
+export function getNoteTypes(tpqn: number) {
+  const maxNoteType = 128;
+  const wholeNoteDuration = tpqn * 4;
+  const noteTypes = [1];
+  for (let noteType = 2; noteType <= maxNoteType; noteType *= 2) {
+    if (wholeNoteDuration % noteType !== 0) {
+      break;
+    }
+    noteTypes.push(noteType);
+  }
+  for (let noteType = 3; noteType <= maxNoteType; noteType *= 2) {
+    if (wholeNoteDuration % noteType !== 0) {
+      break;
+    }
+    noteTypes.push(noteType);
+  }
+  return noteTypes;
+}
+
+export function isTriplet(noteType: number) {
+  return noteType % 3 === 0;
+}
+
 export function getKeyBaseHeight() {
   return BASE_Y_PER_NOTE_NUMBER;
 }
@@ -54,6 +78,14 @@ export function baseYToNoteNumber(baseY: number, integer = true) {
     : 127.5 - baseY / BASE_Y_PER_NOTE_NUMBER;
 }
 
+export function getSnapTypes(tpqn: number) {
+  return getNoteTypes(tpqn).filter((value) => value <= 64);
+}
+
+export function isValidSnapType(snapType: number, tpqn: number) {
+  return getSnapTypes(tpqn).some((value) => value === snapType);
+}
+
 export function getPitchFromNoteNumber(noteNumber: number) {
   const mapPitches = [
     "C",
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 612491239c..3dd1e5c2b9 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -30,6 +30,7 @@ import {
 import { EngineId, StyleId } from "@/type/preload";
 import {
   getDoremiFromNoteNumber,
+  isValidSnapType,
   noteNumberToFrequency,
   round,
 } from "@/helpers/singHelper";
@@ -673,6 +674,19 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_SNAP_TYPE: {
+    mutation(state, { snapType }) {
+      state.sequencerSnapType = snapType;
+    },
+    async action({ state, commit }, { snapType }) {
+      const tpqn = state.score?.resolution ?? 480;
+      if (!isValidSnapType(snapType, tpqn)) {
+        throw new Error("The snap type is invalid.");
+      }
+      commit("SET_SNAP_TYPE", { snapType });
+    },
+  },
+
   SET_ZOOM_X: {
     mutation(state, { zoomX }: { zoomX: number }) {
       state.sequencerZoomX = zoomX;
diff --git a/src/store/type.ts b/src/store/type.ts
index 658cda2791..9028a8fd56 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -838,6 +838,11 @@ export type SingingStoreTypes = {
     action(): void;
   };
 
+  SET_SNAP_TYPE: {
+    mutation: { snapType: number };
+    action(payload: { snapType: number }): void;
+  };
+
   SET_ZOOM_X: {
     mutation: { zoomX: number };
     action(payload: { zoomX: number }): void;

From 645ab4b5c7612f3adf9e3eaf9d22e92d07a81fad Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Fri, 20 Oct 2023 04:25:29 +0900
Subject: [PATCH 23/59] =?UTF-8?q?[project-s]=20=E3=82=A4=E3=83=B3=E3=83=9D?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E5=91=A8=E3=82=8A=E3=81=AE=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E3=81=A8=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=20(#1614)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue |  21 +-
 src/components/Sing/SequencerNote.vue  |   4 +-
 src/components/Sing/ToolBar.vue        |   2 +-
 src/infrastructures/AudioRenderer.ts   |  42 +--
 src/store/singing.ts                   | 443 ++++++++++++++-----------
 src/store/type.ts                      |  52 +--
 6 files changed, 315 insertions(+), 249 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 0d3f03afb1..2224b4b15d 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -172,7 +172,7 @@ export default defineComponent({
     const dragMoveCurrentY = ref();
     const dragDurationCurrentX = ref();
     // 分解能（Ticks Per Quarter Note）
-    const tpqn = computed(() => state.score?.resolution ?? 480);
+    const tpqn = computed(() => state.score?.tpqn ?? 480);
     // ノート
     const notes = computed(() => state.score?.notes ?? []);
     // 拍子
@@ -263,7 +263,7 @@ export default defineComponent({
         note: {
           id,
           position,
-          midi: noteNumber,
+          noteNumber,
           duration,
           lyric,
         },
@@ -337,10 +337,10 @@ export default defineComponent({
           }
           isNotesChanged = true;
           const position = note.position + amountPositionX;
-          const noteNumber = note.midi + amountPositionY;
+          const noteNumber = note.noteNumber + amountPositionY;
           return {
             ...note,
-            midi: noteNumber,
+            noteNumber,
             position,
           };
         } else {
@@ -506,16 +506,16 @@ export default defineComponent({
       }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
-          const noteNumber = Math.min(note.midi + 1, 127);
+          const noteNumber = Math.min(note.noteNumber + 1, 127);
           return {
             ...note,
-            midi: noteNumber,
+            noteNumber,
           };
         } else {
           return note;
         }
       });
-      if (newNotes.some((note) => note.midi > 127)) {
+      if (newNotes.some((note) => note.noteNumber > 127)) {
         return;
       }
       store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
@@ -527,16 +527,16 @@ export default defineComponent({
       }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
-          const noteNumber = Math.max(note.midi - 1, 0);
+          const noteNumber = Math.max(note.noteNumber - 1, 0);
           return {
             ...note,
-            midi: noteNumber,
+            noteNumber,
           };
         } else {
           return note;
         }
       });
-      if (newNotes.some((note) => note.midi < 0)) {
+      if (newNotes.some((note) => note.noteNumber < 0)) {
         return;
       }
       store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
@@ -622,7 +622,6 @@ export default defineComponent({
     });
 
     return {
-      measureNum,
       beatsPerMeasure,
       beatWidth,
       gridCellWidth,
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index b0c9246849..9834ded9e2 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -84,7 +84,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const store = useStore();
     const state = store.state;
-    const tpqn = computed(() => state.score?.resolution ?? 480);
+    const tpqn = computed(() => state.score?.tpqn ?? 480);
     const zoomX = computed(() => state.sequencerZoomX);
     const zoomY = computed(() => state.sequencerZoomY);
     const positionX = computed(() => {
@@ -92,7 +92,7 @@ export default defineComponent({
       return tickToBaseX(noteStartTicks, tpqn.value) * zoomX.value;
     });
     const positionY = computed(() => {
-      const noteNumber = props.note.midi;
+      const noteNumber = props.note.noteNumber;
       return noteNumberToBaseY(noteNumber + 0.5) * zoomY.value;
     });
     const barHeight = computed(() => getKeyBaseHeight() * zoomY.value);
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index d70d571d6b..7931008c28 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -249,7 +249,7 @@ export default defineComponent({
     });
 
     const snapTypeSelectOptions = computed(() => {
-      const tpqn = store.state.score?.resolution ?? 480;
+      const tpqn = store.state.score?.tpqn ?? 480;
       return getSnapTypes(tpqn).map((snapType) => {
         if (isTriplet(snapType)) {
           return { snapType, label: `1/${(snapType / 3) * 2}（三連符）` };
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index eeb5f07c8b..26076fd250 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -411,17 +411,17 @@ export interface Instrument {
    * ノートオンをスケジュールします。
    * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。
    * @param contextTime ノートオンを行う時刻（コンテキスト時間）
-   * @param midi MIDIノート番号
+   * @param noteNumber MIDIノート番号
    */
-  noteOn(contextTime: number, midi: number): void;
+  noteOn(contextTime: number, noteNumber: number): void;
 
   /**
    * ノートオフをスケジュールします。
    * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。
    * @param contextTime ノートオフを行う時刻（コンテキスト時間）
-   * @param midi MIDIノート番号
+   * @param noteNumber MIDIノート番号
    */
-  noteOff(contextTime: number, midi: number): void;
+  noteOff(contextTime: number, noteNumber: number): void;
 
   /**
    * 発音中のすべての音に対して、ノートオフのスケジュールを行います。
@@ -436,7 +436,7 @@ export interface Instrument {
 export type NoteEvent = {
   readonly noteOnTime: number;
   readonly noteOffTime: number;
-  readonly midi: number;
+  readonly noteNumber: number;
 };
 
 /**
@@ -502,8 +502,8 @@ class NoteEventScheduler implements EventScheduler {
         this.startContextTime + (event.noteOffTime - this.startTime);
 
       if (event.noteOnTime < untilTime) {
-        this.instrument.noteOn(noteOnContextTime, event.midi);
-        this.instrument.noteOff(noteOffContextTime, event.midi);
+        this.instrument.noteOn(noteOnContextTime, event.noteNumber);
+        this.instrument.noteOff(noteOffContextTime, event.noteNumber);
         this.index++;
       } else break;
     }
@@ -647,7 +647,7 @@ export type Envelope = {
 };
 
 type SynthVoiceParams = {
-  readonly midi: number;
+  readonly noteNumber: number;
   readonly oscillatorType: OscillatorType;
   readonly envelope: Envelope;
 };
@@ -656,7 +656,7 @@ type SynthVoiceParams = {
  * シンセサイザーのボイスです。音を合成します。
  */
 class SynthVoice {
-  readonly midi: number;
+  readonly noteNumber: number;
   private readonly oscillatorNode: OscillatorNode;
   private readonly gainNode: GainNode;
   private readonly envelope: Envelope;
@@ -678,7 +678,7 @@ class SynthVoice {
   }
 
   constructor(audioContext: BaseAudioContext, params: SynthVoiceParams) {
-    this.midi = params.midi;
+    this.noteNumber = params.noteNumber;
     this.envelope = params.envelope;
 
     this.oscillatorNode = new OscillatorNode(audioContext);
@@ -692,11 +692,11 @@ class SynthVoice {
 
   /**
    * MIDIノート番号を周波数に変換します。
-   * @param midi MIDIノート番号
+   * @param noteNumber MIDIノート番号
    * @returns 周波数（Hz）
    */
-  private midiToFrequency(midi: number) {
-    return 440 * 2 ** ((midi - 69) / 12);
+  private midiToFrequency(noteNumber: number) {
+    return 440 * 2 ** ((noteNumber - 69) / 12);
   }
 
   /**
@@ -715,7 +715,7 @@ class SynthVoice {
     this.gainNode.gain.linearRampToValueAtTime(1, t0 + atk);
     this.gainNode.gain.setTargetAtTime(sus, t0 + atk, dcy);
 
-    const freq = this.midiToFrequency(this.midi);
+    const freq = this.midiToFrequency(this.noteNumber);
     this.oscillatorNode.frequency.value = freq;
 
     this.oscillatorNode.start(contextTime);
@@ -797,16 +797,16 @@ export class PolySynth implements Instrument {
    * ノートオンをスケジュールします。
    * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。
    * @param contextTime ノートオンを行う時刻（コンテキスト時間）
-   * @param midi MIDIノート番号
+   * @param noteNumber MIDIノート番号
    */
-  noteOn(contextTime: number, midi: number) {
+  noteOn(contextTime: number, noteNumber: number) {
     const exists = this.voices.some((value) => {
-      return value.isActive && value.midi === midi;
+      return value.isActive && value.noteNumber === noteNumber;
     });
     if (exists) return;
 
     const voice = new SynthVoice(this.audioContext, {
-      midi,
+      noteNumber,
       oscillatorType: this.oscillatorType,
       envelope: this.envelope,
     });
@@ -822,11 +822,11 @@ export class PolySynth implements Instrument {
    * ノートオフをスケジュールします。
    * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。
    * @param contextTime ノートオフを行う時刻（コンテキスト時間）
-   * @param midi MIDIノート番号
+   * @param noteNumber MIDIノート番号
    */
-  noteOff(contextTime: number, midi: number) {
+  noteOff(contextTime: number, noteNumber: number) {
     const voice = this.voices.find((value) => {
-      return value.isActive && value.midi === midi;
+      return value.isActive && value.noteNumber === noteNumber;
     });
     if (!voice) return;
 
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 3dd1e5c2b9..17fbed0c55 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -37,27 +37,25 @@ import {
 import { AudioQuery, Mora } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
 
-const ticksToSecondsForConstantBpm = (
-  resolution: number,
-  bpm: number,
-  ticks: number
+const tickToSecondForConstantTempo = (
+  ticks: number,
+  tempo: number,
+  tpqn: number
 ) => {
-  const ticksPerBeat = resolution;
-  const beatsPerSecond = bpm / 60;
-  return ticks / ticksPerBeat / beatsPerSecond;
+  const quarterNotesPerSecond = tempo / 60;
+  return ticks / tpqn / quarterNotesPerSecond;
 };
 
-const secondsToTickForConstantBpm = (
-  resolution: number,
-  bpm: number,
-  seconds: number
+const secondToTickForConstantTempo = (
+  seconds: number,
+  tempo: number,
+  tpqn: number
 ) => {
-  const ticksPerBeat = resolution;
-  const beatsPerSecond = bpm / 60;
-  return seconds * beatsPerSecond * ticksPerBeat;
+  const quarterNotesPerSecond = tempo / 60;
+  return seconds * quarterNotesPerSecond * tpqn;
 };
 
-const ticksToSeconds = (resolution: number, tempos: Tempo[], ticks: number) => {
+const tickToSecond = (ticks: number, tempos: Tempo[], tpqn: number) => {
   let timeOfTempo = 0;
   let tempo = tempos[tempos.length - 1];
   for (let i = 0; i < tempos.length; i++) {
@@ -68,27 +66,19 @@ const ticksToSeconds = (resolution: number, tempos: Tempo[], ticks: number) => {
       tempo = tempos[i];
       break;
     }
-    timeOfTempo += ticksToSecondsForConstantBpm(
-      resolution,
+    timeOfTempo += tickToSecondForConstantTempo(
+      tempos[i + 1].position - tempos[i].position,
       tempos[i].tempo,
-      tempos[i + 1].position - tempos[i].position
+      tpqn
     );
   }
   return (
     timeOfTempo +
-    ticksToSecondsForConstantBpm(
-      resolution,
-      tempo.tempo,
-      ticks - tempo.position
-    )
+    tickToSecondForConstantTempo(ticks - tempo.position, tempo.tempo, tpqn)
   );
 };
 
-const secondsToTicks = (
-  resolution: number,
-  tempos: Tempo[],
-  seconds: number
-) => {
+const secondToTick = (seconds: number, tempos: Tempo[], tpqn: number) => {
   let timeOfTempo = 0;
   let tempo = tempos[tempos.length - 1];
   for (let i = 0; i < tempos.length; i++) {
@@ -97,10 +87,10 @@ const secondsToTicks = (
     }
     const timeOfNextTempo =
       timeOfTempo +
-      ticksToSecondsForConstantBpm(
-        resolution,
+      tickToSecondForConstantTempo(
+        tempos[i + 1].position - tempos[i].position,
         tempos[i].tempo,
-        tempos[i + 1].position - tempos[i].position
+        tpqn
       );
     if (timeOfNextTempo > seconds) {
       tempo = tempos[i];
@@ -110,7 +100,7 @@ const secondsToTicks = (
   }
   return (
     tempo.position +
-    secondsToTickForConstantBpm(resolution, tempo.tempo, seconds - timeOfTempo)
+    secondToTickForConstantTempo(seconds - timeOfTempo, tempo.tempo, tpqn)
   );
 };
 
@@ -124,25 +114,21 @@ const generateAudioEvents = async (
   return [{ time, buffer }];
 };
 
-const generateNoteEvents = (
-  resolution: number,
-  tempos: Tempo[],
-  notes: Note[]
-) => {
+const generateNoteEvents = (notes: Note[], tempos: Tempo[], tpqn: number) => {
   return notes.map((value): NoteEvent => {
     const noteOnPos = value.position;
     const noteOffPos = value.position + value.duration;
     return {
-      midi: value.midi,
-      noteOnTime: ticksToSeconds(resolution, tempos, noteOnPos),
-      noteOffTime: ticksToSeconds(resolution, tempos, noteOffPos),
+      noteNumber: value.noteNumber,
+      noteOnTime: tickToSecond(noteOnPos, tempos, tpqn),
+      noteOffTime: tickToSecond(noteOffPos, tempos, tpqn),
     };
   });
 };
 
 const copyScore = (score: Score): Score => {
   return {
-    resolution: score.resolution,
+    tpqn: score.tpqn,
     tempos: score.tempos.map((value) => ({ ...value })),
     timeSignatures: score.timeSignatures.map((value) => ({ ...value })),
     notes: score.notes.map((value) => ({ ...value })),
@@ -225,11 +211,11 @@ const isValidNote = (note: Note) => {
   return (
     Number.isInteger(note.position) &&
     Number.isInteger(note.duration) &&
-    Number.isInteger(note.midi) &&
+    Number.isInteger(note.noteNumber) &&
     note.position >= 0 &&
     note.duration > 0 &&
-    note.midi >= 0 &&
-    note.midi <= 127
+    note.noteNumber >= 0 &&
+    note.noteNumber <= 127
   );
 };
 
@@ -240,7 +226,7 @@ const getFromOptional = <T>(value: T | undefined): T => {
   return value;
 };
 
-const DEFAULT_RESOLUTION = 480;
+const DEFAULT_TPQN = 480;
 const DEFAULT_TEMPO = 120;
 const DEFAULT_BEATS = 4;
 const DEFAULT_BEAT_TYPE = 4;
@@ -351,8 +337,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   GET_EMPTY_SCORE: {
     async action() {
-      const score = {
-        resolution: DEFAULT_RESOLUTION,
+      const score: Score = {
+        tpqn: DEFAULT_TPQN,
         tempos: [{ position: 0, tempo: DEFAULT_TEMPO }],
         timeSignatures: [
           { position: 0, beats: DEFAULT_BEATS, beatType: DEFAULT_BEAT_TYPE },
@@ -679,7 +665,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.sequencerSnapType = snapType;
     },
     async action({ state, commit }, { snapType }) {
-      const tpqn = state.score?.resolution ?? 480;
+      const tpqn = state.score?.tpqn ?? 480;
       if (!isValidSnapType(snapType, tpqn)) {
         throw new Error("The snap type is invalid.");
       }
@@ -733,13 +719,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   POSITION_TO_TIME: {
     getter: (state) => (position) => {
       const score = getFromOptional(state.score);
-      return ticksToSeconds(score.resolution, score.tempos, position);
+      return tickToSecond(position, score.tempos, score.tpqn);
     },
   },
   TIME_TO_POSITION: {
     getter: (state) => (time) => {
       const score = getFromOptional(state.score);
-      return secondsToTicks(score.resolution, score.tempos, time);
+      return secondToTick(time, score.tempos, score.tpqn);
     },
   },
   GET_PLAYBACK_POSITION: {
@@ -976,15 +962,15 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             const mora = moras[j];
             const note = score.notes[noteIndex];
 
-            const noteOnTime = ticksToSeconds(
-              score.resolution,
+            const noteOnTime = tickToSecond(
+              note.position,
               score.tempos,
-              note.position
+              score.tpqn
             );
-            const noteOffTime = ticksToSeconds(
-              score.resolution,
+            const noteOffTime = tickToSecond(
+              note.position + note.duration,
               score.tempos,
-              note.position + note.duration
+              score.tpqn
             );
 
             // 長さを編集
@@ -1020,7 +1006,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             }
 
             // 音高を編集
-            const freq = noteNumberToFrequency(note.midi);
+            const freq = noteNumberToFrequency(note.noteNumber);
             mora.pitch = Math.log(freq);
 
             // 無声化を解除
@@ -1047,10 +1033,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
       const calculateStartTime = (score: Score, query: AudioQuery) => {
         const firstMora = query.accentPhrases[0].moras[0];
-        let startTime = ticksToSeconds(
-          score.resolution,
+        let startTime = tickToSecond(
+          score.notes[0].position,
           score.tempos,
-          score.notes[0].position
+          score.tpqn
         );
         startTime -= query.prePhonemeLength;
         startTime -= firstMora.consonantLength ?? 0;
@@ -1112,9 +1098,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             allPhrases.set(hash, phrase);
             // フレーズ追加時の処理
             const noteEvents = generateNoteEvents(
-              phrase.score.resolution,
+              phrase.score.notes,
               phrase.score.tempos,
-              phrase.score.notes
+              phrase.score.tpqn
             );
             const polySynth = new PolySynth(audioContextRef);
             polySynth.output.connect(channelStripRef.input);
@@ -1285,6 +1271,74 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   IMPORT_MIDI_FILE: {
     action: createUILockAction(
       async ({ dispatch }, { filePath }: { filePath?: string }) => {
+        const convertPosition = (
+          position: number,
+          sourceTpqn: number,
+          targetTpqn: number
+        ) => {
+          return Math.round(position * (targetTpqn / sourceTpqn));
+        };
+
+        const convertDuration = (
+          startPosition: number,
+          endPosition: number,
+          sourceTpqn: number,
+          targetTpqn: number
+        ) => {
+          const convertedEndPosition = convertPosition(
+            endPosition,
+            sourceTpqn,
+            targetTpqn
+          );
+          const convertedStartPosition = convertPosition(
+            startPosition,
+            sourceTpqn,
+            targetTpqn
+          );
+          return Math.max(1, convertedEndPosition - convertedStartPosition);
+        };
+
+        const getTopNotes = (notes: Note[]) => {
+          const topNotes: Note[] = [];
+          for (const note of notes) {
+            if (topNotes.length === 0) {
+              topNotes.push(note);
+              continue;
+            }
+            const topNote = topNotes[topNotes.length - 1];
+            const topNoteEndPos = topNote.position + topNote.duration;
+            if (topNoteEndPos <= note.position) {
+              topNotes.push(note);
+              continue;
+            }
+            if (topNote.noteNumber < note.noteNumber) {
+              topNotes.pop();
+              topNotes.push(note);
+            }
+          }
+          return topNotes;
+        };
+
+        const removeDuplicateTempos = (tempos: Tempo[]) => {
+          return tempos.filter((value, index, array) => {
+            return (
+              index === array.length - 1 ||
+              value.position !== array[index + 1].position
+            );
+          });
+        };
+
+        const removeDuplicateTimeSignatures = (
+          timeSignatures: TimeSignature[]
+        ) => {
+          return timeSignatures.filter((value, index, array) => {
+            return (
+              index === array.length - 1 ||
+              value.position !== array[index + 1].position
+            );
+          });
+        };
+
         if (!filePath) {
           filePath = await window.electron.showImportFileDialog({
             title: "MIDI読み込み",
@@ -1299,84 +1353,69 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         );
         const midi = new Midi(midiData);
 
-        const score = await dispatch("GET_EMPTY_SCORE");
+        const midiTpqn = midi.header.ppq;
+        const midiTempos = [...midi.header.tempos];
+        const midiTimeSignatures = [...midi.header.timeSignatures];
+        // TODO: UIで読み込むトラックを選択できるようにする
+        const midiNotes = [...midi.tracks[0].notes]; // ひとまず1トラック目のみを読み込む
 
-        const convertToPosBasedOnRes = (position: number) => {
-          return Math.round(position * (score.resolution / midi.header.ppq));
-        };
+        midiTempos.sort((a, b) => a.ticks - b.ticks);
+        midiTimeSignatures.sort((a, b) => a.ticks - b.ticks);
+        midiNotes.sort((a, b) => a.ticks - b.ticks);
 
-        const convertToDurationBasedOnRes = (
-          position: number,
-          duration: number
-        ) => {
-          let endPosition = position + duration;
-          endPosition = convertToPosBasedOnRes(endPosition);
-          position = convertToPosBasedOnRes(position);
-          return Math.max(0, endPosition - position);
-        };
+        const tpqn = DEFAULT_TPQN;
 
-        // TODO: UIで読み込むトラックを選択できるようにする
-        // ひとまず1トラック目のみを読み込む
-        midi.tracks[0].notes
-          .map((note) => ({
+        let notes = midiNotes.map((value): Note => {
+          return {
             id: uuidv4(),
-            position: convertToPosBasedOnRes(note.ticks),
-            duration: convertToDurationBasedOnRes(
-              note.ticks,
-              note.durationTicks
+            position: convertPosition(value.ticks, midiTpqn, tpqn),
+            duration: convertDuration(
+              value.ticks,
+              value.ticks + value.durationTicks,
+              midiTpqn,
+              tpqn
             ),
-            midi: note.midi,
-            lyric: getDoremiFromNoteNumber(note.midi),
-          }))
-          .sort((a, b) => a.position - b.position)
-          .forEach((note) => {
-            // ノートの重なりを考慮して、一番音が高いノート（トップノート）のみインポートする
-            if (score.notes.length === 0) {
-              score.notes.push(note);
-              return;
-            }
-            const topNote = score.notes[score.notes.length - 1];
-            const topNoteEnd = topNote.position + topNote.duration;
-            if (note.position >= topNoteEnd) {
-              score.notes.push(note);
-              return;
-            }
-            if (note.midi > topNote.midi) {
-              score.notes.pop();
-              score.notes.push(note);
-            }
-          });
-
-        const tempos = midi.header.tempos
-          .map((tempo) => ({
-            position: convertToPosBasedOnRes(tempo.ticks),
-            tempo: round(tempo.bpm, 2),
-          }))
-          .sort((a, b) => a.position - b.position);
-
-        score.tempos = score.tempos
-          .concat(tempos)
-          .filter((value, index, array) => {
-            if (index === array.length - 1) return true;
-            return value.position !== array[index + 1].position;
-          });
+            noteNumber: value.midi,
+            lyric: getDoremiFromNoteNumber(value.midi),
+          };
+        });
+        // ノートの重なりを考慮して、一番音が高いノート（トップノート）のみインポートする
+        notes = getTopNotes(notes);
 
-        const timeSignatures = midi.header.timeSignatures
-          .map((timeSignature) => ({
-            position: convertToPosBasedOnRes(timeSignature.ticks),
-            beats: timeSignature.timeSignature[0],
-            beatType: timeSignature.timeSignature[1],
-          }))
-          .sort((a, b) => a.position - b.position);
-
-        score.timeSignatures = score.timeSignatures
-          .concat(timeSignatures)
-          .filter((value, index, array) => {
-            if (index === array.length - 1) return true;
-            return value.position !== array[index + 1].position;
-          });
+        let tempos = midiTempos.map((value): Tempo => {
+          return {
+            position: convertPosition(value.ticks, midiTpqn, tpqn),
+            tempo: round(value.bpm, 2),
+          };
+        });
+        tempos.unshift({
+          position: 0,
+          tempo: DEFAULT_TEMPO,
+        });
+        tempos = removeDuplicateTempos(tempos);
 
-        await dispatch("SET_SCORE", { score });
+        let timeSignatures = midiTimeSignatures.map((value): TimeSignature => {
+          return {
+            position: convertPosition(value.ticks, midiTpqn, tpqn),
+            beats: value.timeSignature[0],
+            beatType: value.timeSignature[1],
+          };
+        });
+        timeSignatures.unshift({
+          position: 0,
+          beats: DEFAULT_BEATS,
+          beatType: DEFAULT_BEAT_TYPE,
+        });
+        timeSignatures = removeDuplicateTimeSignatures(timeSignatures);
+
+        await dispatch("SET_SCORE", {
+          score: {
+            tpqn,
+            tempos,
+            timeSignatures,
+            notes,
+          },
+        });
       }
     ),
   },
@@ -1402,30 +1441,50 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           );
         }
 
-        const score = await dispatch("GET_EMPTY_SCORE");
-
-        const getMeasureDuration = (beats: number, beatType: number) => {
-          const referenceMeasureDuration = score.resolution * 4;
-          return Math.round((referenceMeasureDuration * beats) / beatType);
+        const getMeasureDuration = (
+          beats: number,
+          beatType: number,
+          tpqn: number
+        ) => {
+          const wholeNoteDuration = tpqn * 4;
+          return Math.round((wholeNoteDuration / beatType) * beats);
         };
 
+        const tpqn = DEFAULT_TPQN;
+        const tempos: Tempo[] = [
+          {
+            position: 0,
+            tempo: DEFAULT_TEMPO,
+          },
+        ];
+        const timeSignatures: TimeSignature[] = [
+          {
+            position: 0,
+            beats: DEFAULT_BEATS,
+            beatType: DEFAULT_BEAT_TYPE,
+          },
+        ];
+        const notes: Note[] = [];
+
         let divisions = 1;
         let position = 0;
         let measurePosition = 0;
         let measureDuration = getMeasureDuration(
-          score.timeSignatures[0].beats,
-          score.timeSignatures[0].beatType
+          timeSignatures[0].beats,
+          timeSignatures[0].beatType,
+          tpqn
         );
-        let tieStartNote: Note | null = null;
+        let tieStartNote: Note | undefined;
 
-        const getChild = (element: Element | null, tagName: string) => {
-          if (element === null) return null;
-          for (const childElement of element.children) {
-            if (childElement.tagName === tagName) {
-              return childElement;
+        const getChild = (element: Element | undefined, tagName: string) => {
+          if (element) {
+            for (const childElement of element.children) {
+              if (childElement.tagName === tagName) {
+                return childElement;
+              }
             }
           }
-          return null;
+          return undefined;
         };
 
         const getValueAsNumber = (element: Element) => {
@@ -1466,11 +1525,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         const getDuration = (durationElement: Element) => {
           const duration = getValueAsNumber(durationElement);
-          return Math.round((score.resolution * duration) / divisions);
+          return Math.round((tpqn * duration) / divisions);
         };
 
         const getTie = (elementThatMayBeTied: Element) => {
-          let tie = false;
+          let tie: boolean | undefined;
           for (const childElement of elementThatMayBeTied.children) {
             if (
               childElement.tagName === "tie" ||
@@ -1490,15 +1549,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         };
 
         const parseSound = (soundElement: Element) => {
-          if (!soundElement.hasAttribute("tempo")) return;
-          if (score.tempos.length !== 0) {
-            const lastTempo = score.tempos[score.tempos.length - 1];
+          if (!soundElement.hasAttribute("tempo")) {
+            return;
+          }
+          if (tempos.length !== 0) {
+            const lastTempo = tempos[tempos.length - 1];
             if (lastTempo.position === position) {
-              score.tempos.pop();
+              tempos.pop();
             }
           }
           const tempo = getAttributeAsNumber(soundElement, "tempo");
-          score.tempos.push({
+          tempos.push({
             position: position,
             tempo: round(tempo, 2),
           });
@@ -1518,27 +1579,26 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         const parseTime = (timeElement: Element) => {
           const beatsElement = getChild(timeElement, "beats");
-          if (beatsElement === null) {
+          if (!beatsElement) {
             throw new Error("beats element does not exist.");
           }
           const beatTypeElement = getChild(timeElement, "beat-type");
-          if (beatTypeElement === null) {
+          if (!beatTypeElement) {
             throw new Error("beat-type element does not exist.");
           }
           const beats = getValueAsNumber(beatsElement);
           const beatType = getValueAsNumber(beatTypeElement);
-          measureDuration = getMeasureDuration(beats, beatType);
-          if (score.timeSignatures.length !== 0) {
-            const lastTimeSignature =
-              score.timeSignatures[score.timeSignatures.length - 1];
+          measureDuration = getMeasureDuration(beats, beatType, tpqn);
+          if (timeSignatures.length !== 0) {
+            const lastTimeSignature = timeSignatures[timeSignatures.length - 1];
             if (lastTimeSignature.position === position) {
-              score.timeSignatures.pop();
+              timeSignatures.pop();
             }
           }
-          score.timeSignatures.push({
-            position: position,
-            beats: beats,
-            beatType: beatType,
+          timeSignatures.push({
+            position,
+            beats,
+            beatType,
           });
         };
 
@@ -1559,7 +1619,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           //       それらが存在する場合でも読み込めるようにする
 
           const durationElement = getChild(noteElement, "duration");
-          if (durationElement === null) {
+          if (!durationElement) {
             throw new Error("duration element does not exist.");
           }
           let duration = getDuration(durationElement);
@@ -1571,21 +1631,21 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             noteEnd = position + duration;
           }
 
-          if (getChild(noteElement, "rest") !== null) {
+          if (getChild(noteElement, "rest")) {
             position += duration;
             return;
           }
 
           const pitchElement = getChild(noteElement, "pitch");
-          if (pitchElement === null) {
+          if (!pitchElement) {
             throw new Error("pitch element does not exist.");
           }
           const octaveElement = getChild(pitchElement, "octave");
-          if (octaveElement === null) {
+          if (!octaveElement) {
             throw new Error("octave element does not exist.");
           }
           const stepElement = getChild(pitchElement, "step");
-          if (stepElement === null) {
+          if (!stepElement) {
             throw new Error("step element does not exist.");
           }
           const alterElement = getChild(pitchElement, "alter");
@@ -1593,7 +1653,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           const octave = getValueAsNumber(octaveElement);
           const stepNumber = getStepNumber(stepElement);
           let noteNumber = 12 * (octave + 1) + stepNumber;
-          if (alterElement !== null) {
+          if (alterElement) {
             noteNumber += getValueAsNumber(alterElement);
           }
 
@@ -1607,25 +1667,25 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             }
           }
 
-          const note = {
-            position: position,
-            duration: duration,
-            midi: noteNumber,
-            lyric: lyric,
+          const note: Note = {
             id: uuidv4(),
+            position,
+            duration,
+            noteNumber,
+            lyric,
           };
 
-          if (tie) {
-            if (tieStartNote === null) {
-              tieStartNote = note;
+          if (tieStartNote) {
+            if (tie === false) {
+              tieStartNote.duration = noteEnd - tieStartNote.position;
+              notes.push(tieStartNote);
+              tieStartNote = undefined;
             }
           } else {
-            if (tieStartNote === null) {
-              score.notes.push(note);
+            if (tie === true) {
+              tieStartNote = note;
             } else {
-              tieStartNote.duration = noteEnd - tieStartNote.position;
-              score.notes.push(tieStartNote);
-              tieStartNote = null;
+              notes.push(note);
             }
           }
           position += duration;
@@ -1648,7 +1708,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           }
           const measureEnd = measurePosition + measureDuration;
           if (position !== measureEnd) {
-            tieStartNote = null;
+            tieStartNote = undefined;
             position = measureEnd;
           }
         };
@@ -1674,7 +1734,14 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         parseMusicXml(xmlStr);
 
-        await dispatch("SET_SCORE", { score });
+        await dispatch("SET_SCORE", {
+          score: {
+            tpqn,
+            tempos,
+            timeSignatures,
+            notes,
+          },
+        });
       }
     ),
   },
@@ -1843,9 +1910,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           } else {
             // レンダリング未完了のフレーズの場合
             const noteEvents = generateNoteEvents(
-              phrase.score.resolution,
+              phrase.score.notes,
               phrase.score.tempos,
-              phrase.score.notes
+              phrase.score.tpqn
             );
             const polySynth = new PolySynth(offlineAudioContext);
             polySynth.output.connect(channelStrip.input);
diff --git a/src/store/type.ts b/src/store/type.ts
index 9028a8fd56..41cef85cd9 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -76,32 +76,6 @@ export type AudioState = {
   nowGenerating: boolean;
 };
 
-export type Tempo = {
-  position: number;
-  tempo: number;
-};
-
-export type TimeSignature = {
-  position: number;
-  beats: number;
-  beatType: number;
-};
-
-export type Note = {
-  id: string;
-  position: number;
-  duration: number;
-  midi: number;
-  lyric: string;
-};
-
-export type Score = {
-  resolution: number;
-  tempos: Tempo[];
-  timeSignatures: TimeSignature[];
-  notes: Note[];
-};
-
 export type Command = {
   unixMillisec: number;
   undoPatches: Patch[];
@@ -740,6 +714,32 @@ export type AudioPlayerStoreTypes = {
  * Singing Store Types
  */
 
+export type Tempo = {
+  position: number;
+  tempo: number;
+};
+
+export type TimeSignature = {
+  position: number;
+  beats: number;
+  beatType: number;
+};
+
+export type Note = {
+  id: string;
+  position: number;
+  duration: number;
+  noteNumber: number;
+  lyric: string;
+};
+
+export type Score = {
+  tpqn: number;
+  tempos: Tempo[];
+  timeSignatures: TimeSignature[];
+  notes: Note[];
+};
+
 export type SingingStoreState = {
   engineId?: EngineId;
   styleId?: StyleId;

From be89daebf1b2697e0d203c96e03eb38a63f3f67d Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 23 Oct 2023 02:04:30 +0900
Subject: [PATCH 24/59] =?UTF-8?q?[project-s]=20=E3=82=B9=E3=83=8A=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E5=91=A8=E3=82=8A=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=A8?=
 =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=B0=20(#1615)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue |  36 ++--
 src/components/Sing/ToolBar.vue        |  26 ++-
 src/helpers/singHelper.ts              |  21 +-
 src/store/singing.ts                   | 262 +++++++++++++------------
 src/store/type.ts                      |  16 +-
 src/views/SingerHome.vue               |   4 -
 6 files changed, 189 insertions(+), 176 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 2224b4b15d..fc5799fa2d 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -14,7 +14,7 @@
       <!-- グリッド -->
       <!-- NOTE: 現状小節+オクターブごとの罫線なし -->
       <svg
-        :width="`${gridCellWidth * gridColumnNum}`"
+        :width="`${gridCellWidth * numOfGridColumns}`"
         :height="`${gridCellHeight * keyInfos.length}`"
         xmlns="http://www.w3.org/2000/svg"
         class="sequencer-grid"
@@ -184,17 +184,6 @@ export default defineComponent({
     const timeSignature = computed(() => {
       return state.score?.timeSignatures?.[0] ?? defaultTimeSignature;
     });
-    // 小節数
-    const measureNum = computed(() => {
-      // NOTE: 最低長: 仮32小節...スコア長(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
-      const minMeasureNum = 32;
-      const measureNum = Math.max(
-        minMeasureNum,
-        getMeasureNum(notes.value, measureDuration.value)
-      );
-      // NOTE: いったん最後尾に足した場合は伸びるようにする
-      return measureNum + 1;
-    });
     // ズーム状態
     const zoomX = computed(() => state.sequencerZoomX);
     const zoomY = computed(() => state.sequencerZoomY);
@@ -218,14 +207,21 @@ export default defineComponent({
     const gridCellHeight = computed(() => {
       return gridCellBaseHeight * zoomY.value;
     });
-    const measureDuration = computed(() => {
-      return getMeasureDuration(timeSignature.value, tpqn.value);
-    });
-    const gridColumnNum = computed(() => {
-      const gridColumnNumPerMeasure = Math.round(
-        measureDuration.value / gridCellTicks.value
+    const numOfGridColumns = computed(() => {
+      const beats = timeSignature.value.beats;
+      const beatType = timeSignature.value.beatType;
+      const measureDuration = getMeasureDuration(beats, beatType, tpqn.value);
+      const numOfGridColumnsPerMeasure = Math.round(
+        measureDuration / gridCellTicks.value
+      );
+      // NOTE: 最低長: 仮32小節...スコア長(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
+      const minNumOfMeasures = 32;
+      // NOTE: いったん最後尾に足した場合は伸びるようにする
+      const numOfMeasures = Math.max(
+        minNumOfMeasures,
+        getMeasureNum(notes.value, measureDuration) + 1
       );
-      return gridColumnNumPerMeasure * measureNum.value;
+      return numOfGridColumnsPerMeasure * numOfMeasures;
     });
     const beatsPerMeasure = computed(() => {
       return timeSignature.value.beats;
@@ -626,7 +622,7 @@ export default defineComponent({
       beatWidth,
       gridCellWidth,
       gridCellHeight,
-      gridColumnNum,
+      numOfGridColumns,
       keyInfos,
       notes,
       zoomX,
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 7931008c28..0574c714c1 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -154,7 +154,7 @@ export default defineComponent({
     const playbackPositionStr = computed(() => {
       let playTime = 0;
       if (store.state.score) {
-        playTime = store.getters.POSITION_TO_TIME(playPos.value);
+        playTime = store.getters.TICK_TO_SECOND(playPos.value);
       }
 
       const intPlayTime = Math.floor(playTime);
@@ -250,13 +250,21 @@ export default defineComponent({
 
     const snapTypeSelectOptions = computed(() => {
       const tpqn = store.state.score?.tpqn ?? 480;
-      return getSnapTypes(tpqn).map((snapType) => {
-        if (isTriplet(snapType)) {
-          return { snapType, label: `1/${(snapType / 3) * 2}（三連符）` };
-        } else {
-          return { snapType, label: `1/${snapType}` };
-        }
-      });
+      return getSnapTypes(tpqn)
+        .sort((a, b) => {
+          if (isTriplet(a) === isTriplet(b)) {
+            return a - b;
+          } else {
+            return isTriplet(a) ? 1 : -1;
+          }
+        })
+        .map((snapType) => {
+          if (isTriplet(snapType)) {
+            return { snapType, label: `1/${(snapType / 3) * 2}（三連符）` };
+          } else {
+            return { snapType, label: `1/${snapType}` };
+          }
+        });
     });
     const snapTypeSelectModel = computed({
       get() {
@@ -264,7 +272,7 @@ export default defineComponent({
         const selectOptions = snapTypeSelectOptions.value;
         return (
           selectOptions.find((value) => value.snapType === snapType) ??
-          selectOptions[selectOptions.length - 1]
+          selectOptions[0]
         );
       },
       set(value) {
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index fb7dc7228c..237988b6af 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -1,4 +1,4 @@
-import { Note, TimeSignature } from "@/store/type";
+import { Note } from "@/store/type";
 
 const BASE_X_PER_QUARTER_NOTE = 120;
 const BASE_Y_PER_NOTE_NUMBER = 30;
@@ -8,11 +8,13 @@ export function noteNumberToFrequency(noteNumber: number) {
 }
 
 // NOTE: 戻り値の単位はtick
-export function getMeasureDuration(timeSignature: TimeSignature, tpqn: number) {
-  const beats = timeSignature.beats;
-  const beatType = timeSignature.beatType;
-  const quarterNotesPerMeasure = (4 / beatType) * beats;
-  return tpqn * quarterNotesPerMeasure;
+export function getMeasureDuration(
+  beats: number,
+  beatType: number,
+  tpqn: number
+) {
+  const wholeNoteDuration = tpqn * 4;
+  return (wholeNoteDuration / beatType) * beats;
 }
 
 // TODO: getNumOfMeasuresに変更する
@@ -30,7 +32,7 @@ export function getNoteDuration(noteType: number, tpqn: number) {
   return (tpqn * 4) / noteType;
 }
 
-export function getNoteTypes(tpqn: number) {
+export function getRepresentableNoteTypes(tpqn: number) {
   const maxNoteType = 128;
   const wholeNoteDuration = tpqn * 4;
   const noteTypes = [1];
@@ -79,7 +81,10 @@ export function baseYToNoteNumber(baseY: number, integer = true) {
 }
 
 export function getSnapTypes(tpqn: number) {
-  return getNoteTypes(tpqn).filter((value) => value <= 64);
+  const maxSnapType = 64;
+  return getRepresentableNoteTypes(tpqn).filter((value) => {
+    return value <= maxSnapType;
+  });
 }
 
 export function isValidSnapType(snapType: number, tpqn: number) {
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 17fbed0c55..8a4681b0ea 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -219,6 +219,22 @@ const isValidNote = (note: Note) => {
   );
 };
 
+const isValidTempos = (tempos: Tempo[]) => {
+  return (
+    tempos.length > 0 &&
+    tempos[0].position === 0 &&
+    tempos.every((value) => isValidTempo(value))
+  );
+};
+
+const isValidTimeSignatures = (timeSignatures: TimeSignature[]) => {
+  return (
+    timeSignatures.length > 0 &&
+    timeSignatures[0].position === 0 &&
+    timeSignatures.every((value) => isValidTimeSignature(value))
+  );
+};
+
 const getFromOptional = <T>(value: T | undefined): T => {
   if (value === undefined) {
     throw new Error("The value is undefined.");
@@ -231,6 +247,26 @@ const DEFAULT_TEMPO = 120;
 const DEFAULT_BEATS = 4;
 const DEFAULT_BEAT_TYPE = 4;
 
+const createEmptyScore = (): Score => {
+  return {
+    tpqn: DEFAULT_TPQN,
+    tempos: [
+      {
+        position: 0,
+        tempo: DEFAULT_TEMPO,
+      },
+    ],
+    timeSignatures: [
+      {
+        position: 0,
+        beats: DEFAULT_BEATS,
+        beatType: DEFAULT_BEAT_TYPE,
+      },
+    ],
+    notes: [],
+  };
+};
+
 let audioContext: AudioContext | undefined;
 let transport: Transport | undefined;
 let channelStrip: ChannelStrip | undefined;
@@ -257,7 +293,7 @@ const phraseAudioBlobCache = new Map<string, Blob>();
 export const singingStoreState: SingingStoreState = {
   engineId: undefined,
   styleId: undefined,
-  score: undefined,
+  score: createEmptyScore(),
   // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
   isShowSinger: true,
   sequencerZoomX: 0.5,
@@ -335,36 +371,20 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  GET_EMPTY_SCORE: {
-    async action() {
-      const score: Score = {
-        tpqn: DEFAULT_TPQN,
-        tempos: [{ position: 0, tempo: DEFAULT_TEMPO }],
-        timeSignatures: [
-          { position: 0, beats: DEFAULT_BEATS, beatType: DEFAULT_BEAT_TYPE },
-        ],
-        notes: [],
-      };
-      if (score.tempos.length !== 1 || score.tempos[0].position !== 0) {
-        throw new Error("Tempo does not exist at the beginning of the score.");
-      }
-      if (
-        score.timeSignatures.length !== 1 ||
-        score.timeSignatures[0].position !== 0
-      ) {
-        throw new Error(
-          "Time signature does not exist at the beginning of the score."
-        );
-      }
-      return score;
-    },
-  },
-
   SET_SCORE: {
     mutation(state, { score }: { score: Score }) {
       state.score = score;
     },
-    async action({ state, getters, commit, dispatch }, { score }) {
+    async action(
+      { state, getters, commit, dispatch },
+      { score }: { score: Score }
+    ) {
+      if (!isValidTempos(score.tempos)) {
+        throw new Error("The tempos are invalid.");
+      }
+      if (!isValidTimeSignatures(score.timeSignatures)) {
+        throw new Error("The time signatures are invalid.");
+      }
       if (!transport) {
         throw new Error("transport is undefined.");
       }
@@ -372,161 +392,152 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         await dispatch("SING_STOP_AUDIO");
       }
       commit("SET_SCORE", { score });
-
-      transport.time = getters.POSITION_TO_TIME(playbackPosition);
+      transport.time = getters.TICK_TO_SECOND(playbackPosition);
 
       dispatch("RENDER");
     },
   },
 
   SET_TEMPO: {
-    mutation(state, { index, tempo }: { index: number; tempo: Tempo }) {
+    mutation(state, { tempo }: { tempo: Tempo }) {
       const score = getFromOptional(state.score);
+      const index = score.tempos.findIndex((value) => {
+        return value.position === tempo.position;
+      });
       const tempos = [...score.tempos];
-      tempos.splice(index, 0, tempo);
+      if (index !== -1) {
+        tempos.splice(index, 1, tempo);
+      } else {
+        tempos.push(tempo);
+        tempos.sort((a, b) => a.position - b.position);
+      }
       score.tempos = tempos;
     },
     // テンポを設定する。既に同じ位置にテンポが存在する場合は置き換える。
-    async action({ state, getters, commit, dispatch }, { tempo }) {
-      const score = state.score;
-      if (score === undefined || score.tempos.length === 0) {
-        throw new Error("Score is not initialized.");
-      }
+    async action(
+      { state, getters, commit, dispatch },
+      { tempo }: { tempo: Tempo }
+    ) {
       if (!transport) {
         throw new Error("transport is undefined.");
       }
       if (!isValidTempo(tempo)) {
         throw new Error("The tempo is invalid.");
       }
-      const duplicate = score.tempos.some((value) => {
-        return value.position === tempo.position;
-      });
-      const index = score.tempos.findIndex((value) => {
-        return value.position >= tempo.position;
-      });
-      if (index === -1) return;
-
-      tempo.tempo = round(tempo.tempo, 2);
-
       if (state.nowPlaying) {
-        playbackPosition = getters.TIME_TO_POSITION(transport.time);
+        playbackPosition = getters.SECOND_TO_TICK(transport.time);
       }
-
-      if (duplicate) {
-        commit("REMOVE_TEMPO", { index });
-      }
-      commit("SET_TEMPO", { index, tempo });
-
-      transport.time = getters.POSITION_TO_TIME(playbackPosition);
+      tempo.tempo = round(tempo.tempo, 2);
+      commit("SET_TEMPO", { tempo });
+      transport.time = getters.TICK_TO_SECOND(playbackPosition);
 
       dispatch("RENDER");
     },
   },
 
   REMOVE_TEMPO: {
-    mutation(state, { index }: { index: number }) {
+    mutation(state, { position }: { position: number }) {
       const score = getFromOptional(state.score);
+      const index = score.tempos.findIndex((value) => {
+        return value.position === position;
+      });
+      if (index === -1) {
+        throw new Error("The tempo does not exist.");
+      }
       const tempos = [...score.tempos];
-      tempos.splice(index, 1);
+      if (index === 0) {
+        tempos.splice(index, 1, {
+          position: 0,
+          tempo: DEFAULT_TEMPO,
+        });
+      } else {
+        tempos.splice(index, 1);
+      }
       score.tempos = tempos;
     },
     // テンポを削除する。先頭のテンポの場合はデフォルトのテンポに置き換える。
-    async action({ state, getters, commit, dispatch }, { position }) {
-      const emptyScore = await dispatch("GET_EMPTY_SCORE");
-      const defaultTempo = emptyScore.tempos[0];
-
-      const score = state.score;
-      if (score === undefined || score.tempos.length === 0) {
-        throw new Error("Score is not initialized.");
+    async action(
+      { state, getters, commit, dispatch },
+      { position }: { position: number }
+    ) {
+      const score = getFromOptional(state.score);
+      const exists = score.tempos.some((value) => {
+        return value.position === position;
+      });
+      if (!exists) {
+        throw new Error("The tempo does not exist.");
       }
       if (!transport) {
         throw new Error("transport is undefined.");
       }
-      const index = score.tempos.findIndex((value) => {
-        return value.position === position;
-      });
-      if (index === -1) return;
-
       if (state.nowPlaying) {
-        playbackPosition = getters.TIME_TO_POSITION(transport.time);
-      }
-
-      commit("REMOVE_TEMPO", { index });
-      if (index === 0) {
-        commit("SET_TEMPO", { index, tempo: defaultTempo });
+        playbackPosition = getters.SECOND_TO_TICK(transport.time);
       }
-
-      transport.time = getters.POSITION_TO_TIME(playbackPosition);
+      commit("REMOVE_TEMPO", { position });
+      transport.time = getters.TICK_TO_SECOND(playbackPosition);
 
       dispatch("RENDER");
     },
   },
 
   SET_TIME_SIGNATURE: {
-    mutation(
-      state,
-      { index, timeSignature }: { index: number; timeSignature: TimeSignature }
-    ) {
+    mutation(state, { timeSignature }: { timeSignature: TimeSignature }) {
       const score = getFromOptional(state.score);
+      const index = score.timeSignatures.findIndex((value) => {
+        return value.position === timeSignature.position;
+      });
       const timeSignatures = [...score.timeSignatures];
-      timeSignatures.splice(index, 0, timeSignature);
+      if (index !== -1) {
+        timeSignatures.splice(index, 1, timeSignature);
+      } else {
+        timeSignatures.push(timeSignature);
+        timeSignatures.sort((a, b) => a.position - b.position);
+      }
       score.timeSignatures = timeSignatures;
     },
     // 拍子を設定する。既に同じ位置に拍子が存在する場合は置き換える。
     async action(
-      { state, commit },
+      { commit },
       { timeSignature }: { timeSignature: TimeSignature }
     ) {
-      const score = state.score;
-      if (score === undefined || score.timeSignatures.length === 0) {
-        throw new Error("Score is not initialized.");
-      }
       if (!isValidTimeSignature(timeSignature)) {
         throw new Error("The time signature is invalid.");
       }
-      const duplicate = score.timeSignatures.some((value) => {
-        return value.position === timeSignature.position;
-      });
-      const index = score.timeSignatures.findIndex((value) => {
-        return value.position >= timeSignature.position;
-      });
-      if (index === -1) return;
-
-      if (duplicate) {
-        commit("REMOVE_TIME_SIGNATURE", { index });
-      }
-      commit("SET_TIME_SIGNATURE", { index, timeSignature });
+      commit("SET_TIME_SIGNATURE", { timeSignature });
     },
   },
 
   REMOVE_TIME_SIGNATURE: {
-    mutation(state, { index }: { index: number }) {
+    mutation(state, { position }: { position: number }) {
       const score = getFromOptional(state.score);
+      const index = score.timeSignatures.findIndex((value) => {
+        return value.position === position;
+      });
+      if (index === -1) {
+        throw new Error("The time signature does not exist.");
+      }
       const timeSignatures = [...score.timeSignatures];
-      timeSignatures.splice(index, 1);
+      if (index === 0) {
+        timeSignatures.splice(index, 1, {
+          position: 0,
+          beats: DEFAULT_BEATS,
+          beatType: DEFAULT_BEAT_TYPE,
+        });
+      } else {
+        timeSignatures.splice(index, 1);
+      }
       score.timeSignatures = timeSignatures;
     },
     // 拍子を削除する。先頭の拍子の場合はデフォルトの拍子に置き換える。
-    async action({ state, commit, dispatch }, { position }) {
-      const emptyScore = await dispatch("GET_EMPTY_SCORE");
-      const defaultTimeSignature = emptyScore.timeSignatures[0];
-
-      const score = state.score;
-      if (score === undefined || score.timeSignatures.length === 0) {
-        throw new Error("Score is not initialized.");
-      }
-      const index = score.timeSignatures.findIndex((value) => {
+    async action({ state, commit }, { position }: { position: number }) {
+      const score = getFromOptional(state.score);
+      const exists = score.timeSignatures.some((value) => {
         return value.position === position;
       });
-      if (index === -1) return;
-
-      commit("REMOVE_TIME_SIGNATURE", { index });
-      if (index === 0) {
-        commit("SET_TIME_SIGNATURE", {
-          index,
-          timeSignature: defaultTimeSignature,
-        });
+      if (!exists) {
+        throw new Error("The time signature does not exist.");
       }
+      commit("REMOVE_TIME_SIGNATURE", { position });
     },
   },
 
@@ -643,7 +654,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  // 選択中のノートを削除する
   REMOVE_SELECTED_NOTES: {
     mutation(state) {
       if (state.score) {
@@ -716,25 +726,28 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       });
     },
   },
-  POSITION_TO_TIME: {
+
+  TICK_TO_SECOND: {
     getter: (state) => (position) => {
       const score = getFromOptional(state.score);
       return tickToSecond(position, score.tempos, score.tpqn);
     },
   },
-  TIME_TO_POSITION: {
+
+  SECOND_TO_TICK: {
     getter: (state) => (time) => {
       const score = getFromOptional(state.score);
       return secondToTick(time, score.tempos, score.tpqn);
     },
   },
+
   GET_PLAYBACK_POSITION: {
     getter: (state, getters) => () => {
       if (!transport) {
         throw new Error("transport is undefined.");
       }
       if (state.nowPlaying) {
-        playbackPosition = getters.TIME_TO_POSITION(transport.time);
+        playbackPosition = getters.SECOND_TO_TICK(transport.time);
       }
       return playbackPosition;
     },
@@ -746,8 +759,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         throw new Error("transport is undefined.");
       }
       playbackPosition = position;
-
-      transport.time = getters.POSITION_TO_TIME(position);
+      transport.time = getters.TICK_TO_SECOND(position);
     },
   },
 
@@ -1838,8 +1850,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         const leftLocatorPos = state.leftLocatorPosition;
         const rightLocatorPos = state.rightLocatorPosition;
-        const renderStartTime = getters.POSITION_TO_TIME(leftLocatorPos);
-        const renderEndTime = getters.POSITION_TO_TIME(rightLocatorPos);
+        const renderStartTime = getters.TICK_TO_SECOND(leftLocatorPos);
+        const renderEndTime = getters.TICK_TO_SECOND(rightLocatorPos);
         const renderDuration = renderEndTime - renderStartTime;
 
         if (renderEndTime <= renderStartTime) {
diff --git a/src/store/type.ts b/src/store/type.ts
index 41cef85cd9..c331d5f2d8 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -774,32 +774,28 @@ export type SingingStoreTypes = {
     action(payload: { engineId?: EngineId; styleId?: StyleId }): void;
   };
 
-  GET_EMPTY_SCORE: {
-    action(): Promise<Score>;
-  };
-
   SET_SCORE: {
     mutation: { score: Score };
     action(payload: { score: Score }): void;
   };
 
   SET_TEMPO: {
-    mutation: { index: number; tempo: Tempo };
+    mutation: { tempo: Tempo };
     action(payload: { tempo: Tempo }): void;
   };
 
   REMOVE_TEMPO: {
-    mutation: { index: number };
+    mutation: { position: number };
     action(payload: { position: number }): void;
   };
 
   SET_TIME_SIGNATURE: {
-    mutation: { index: number; timeSignature: TimeSignature };
+    mutation: { timeSignature: TimeSignature };
     action(payload: { timeSignature: TimeSignature }): void;
   };
 
   REMOVE_TIME_SIGNATURE: {
-    mutation: { index: number };
+    mutation: { position: number };
     action(payload: { position: number }): void;
   };
 
@@ -880,11 +876,11 @@ export type SingingStoreTypes = {
     action(payload: { filePath?: string }): SaveResultObject;
   };
 
-  POSITION_TO_TIME: {
+  TICK_TO_SECOND: {
     getter(position: number): number;
   };
 
-  TIME_TO_POSITION: {
+  SECOND_TO_TICK: {
     getter(time: number): number;
   };
 
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index bf93886acd..ae375ed0bc 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -48,10 +48,6 @@ export default defineComponent({
 
     // 歌声合成エディターの初期化
     onMounted(async () => {
-      if (store.state.score === undefined) {
-        const emptyScore = await store.dispatch("GET_EMPTY_SCORE");
-        await store.dispatch("SET_SCORE", { score: emptyScore });
-      }
       await store.dispatch("SET_SINGER", {});
 
       await store.dispatch("SET_VOLUME", { volume: 0.3 });

From 07cec39b0c85945397cd496f6bc94f301f8ec5cd Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 26 Oct 2023 02:57:35 +0900
Subject: [PATCH 25/59] =?UTF-8?q?[project-s]=20=E6=8B=8D=E5=AD=90=E5=91=A8?=
 =?UTF-8?q?=E3=82=8A=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=A8=E3=83=AA=E3=83=95?=
 =?UTF-8?q?=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0=20(#1621?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue |  51 +++++++---
 src/components/Sing/ToolBar.vue        |  16 ++-
 src/helpers/singHelper.ts              |  87 ++++++++++++++--
 src/store/singing.ts                   | 133 ++++++++++++++-----------
 src/store/type.ts                      |   6 +-
 src/views/SingerHome.vue               |   2 +
 6 files changed, 204 insertions(+), 91 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index fc5799fa2d..1953c226e5 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -130,12 +130,10 @@
 import { defineComponent, computed, ref, onMounted } from "vue";
 import { v4 as uuidv4 } from "uuid";
 import { useStore } from "@/store";
-import { TimeSignature } from "@/store/type";
 import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
 import SequencerNote from "@/components/Sing/SequencerNote.vue";
 import {
   getMeasureDuration,
-  getMeasureNum,
   getNoteDuration,
   getKeyBaseHeight,
   tickToBaseX,
@@ -144,6 +142,7 @@ import {
   baseYToNoteNumber,
   keyInfos,
   getDoremiFromNoteNumber,
+  getNumOfMeasures,
 } from "@/helpers/singHelper";
 
 export default defineComponent({
@@ -175,14 +174,28 @@ export default defineComponent({
     const tpqn = computed(() => state.score?.tpqn ?? 480);
     // ノート
     const notes = computed(() => state.score?.notes ?? []);
+    // テンポ
+    const tempos = computed(() => {
+      return (
+        state.score?.tempos ?? [
+          {
+            position: 0,
+            tempo: 120,
+          },
+        ]
+      );
+    });
     // 拍子
-    const defaultTimeSignature: TimeSignature = {
-      position: 0,
-      beats: 4,
-      beatType: 4,
-    };
-    const timeSignature = computed(() => {
-      return state.score?.timeSignatures?.[0] ?? defaultTimeSignature;
+    const timeSignatures = computed(() => {
+      return (
+        state.score?.timeSignatures ?? [
+          {
+            measureNumber: 1,
+            beats: 4,
+            beatType: 4,
+          },
+        ]
+      );
     });
     // ズーム状態
     const zoomX = computed(() => state.sequencerZoomX);
@@ -208,8 +221,9 @@ export default defineComponent({
       return gridCellBaseHeight * zoomY.value;
     });
     const numOfGridColumns = computed(() => {
-      const beats = timeSignature.value.beats;
-      const beatType = timeSignature.value.beatType;
+      // TODO: 複数拍子に対応する
+      const beats = timeSignatures.value[0].beats;
+      const beatType = timeSignatures.value[0].beatType;
       const measureDuration = getMeasureDuration(beats, beatType, tpqn.value);
       const numOfGridColumnsPerMeasure = Math.round(
         measureDuration / gridCellTicks.value
@@ -219,17 +233,22 @@ export default defineComponent({
       // NOTE: いったん最後尾に足した場合は伸びるようにする
       const numOfMeasures = Math.max(
         minNumOfMeasures,
-        getMeasureNum(notes.value, measureDuration) + 1
+        getNumOfMeasures(
+          notes.value,
+          tempos.value,
+          timeSignatures.value,
+          tpqn.value
+        ) + 1
       );
       return numOfGridColumnsPerMeasure * numOfMeasures;
     });
     const beatsPerMeasure = computed(() => {
-      return timeSignature.value.beats;
+      return timeSignatures.value[0].beats;
     });
     const beatWidth = computed(() => {
-      const beatType = timeSignature.value.beatType;
-      const quarterNotesPerBeat = 4 / beatType;
-      const beatTicks = tpqn.value * quarterNotesPerBeat;
+      const beatType = timeSignatures.value[0].beatType;
+      const wholeNoteDuration = tpqn.value * 4;
+      const beatTicks = wholeNoteDuration / beatType;
       return tickToBaseX(beatTicks, tpqn.value) * zoomX.value;
     });
     // スクロール位置
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 0574c714c1..ef97bd8b93 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -93,7 +93,7 @@
 <script lang="ts">
 import { defineComponent, computed, watch, ref } from "vue";
 import { useStore } from "@/store";
-import { getSnapTypes, isTriplet } from "@/helpers/singHelper";
+import { BEAT_TYPES, getSnapTypes, isTriplet } from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingToolBar",
@@ -135,17 +135,23 @@ export default defineComponent({
 
     const setTempoInputBuffer = (tempoStr: string | number | null) => {
       const tempo = Number(tempoStr);
-      if (!Number.isFinite(tempo) || tempo <= 0) return;
+      if (!Number.isFinite(tempo) || tempo <= 0) {
+        return;
+      }
       tempoInputBuffer.value = tempo;
     };
     const setBeatsInputBuffer = (beatsStr: string | number | null) => {
       const beats = Number(beatsStr);
-      if (!Number.isInteger(beats) || beats <= 0) return;
+      if (!Number.isInteger(beats) || beats <= 0) {
+        return;
+      }
       beatsInputBuffer.value = beats;
     };
     const setBeatTypeInputBuffer = (beatTypeStr: string | number | null) => {
       const beatType = Number(beatTypeStr);
-      if (!Number.isInteger(beatType) || beatType <= 0) return;
+      if (!Number.isInteger(beatType) || !BEAT_TYPES.includes(beatType)) {
+        return;
+      }
       beatTypeInputBuffer.value = beatType;
     };
 
@@ -219,7 +225,7 @@ export default defineComponent({
       if (beats === 0 || beatType === 0) return;
       await store.dispatch("SET_TIME_SIGNATURE", {
         timeSignature: {
-          position: 0,
+          measureNumber: 1,
           beats: beats,
           beatType: beatType,
         },
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index 237988b6af..e138518499 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -1,4 +1,11 @@
-import { Note } from "@/store/type";
+import { Note, Score, Tempo, TimeSignature } from "@/store/type";
+
+export const BEAT_TYPES = [2, 4, 8, 16];
+
+export const DEFAULT_TPQN = 480;
+export const DEFAULT_TEMPO = 120;
+export const DEFAULT_BEATS = 4;
+export const DEFAULT_BEAT_TYPE = 4;
 
 const BASE_X_PER_QUARTER_NOTE = 120;
 const BASE_Y_PER_NOTE_NUMBER = 30;
@@ -7,6 +14,40 @@ export function noteNumberToFrequency(noteNumber: number) {
   return 440 * 2 ** ((noteNumber - 69) / 12);
 }
 
+// NOTE: 戻り値の単位はtick
+export function getTimeSignaturePositions(
+  timeSignatures: TimeSignature[],
+  tpqn: number
+) {
+  const tsPositions: number[] = [0];
+  for (let i = 0; i < timeSignatures.length - 1; i++) {
+    const ts = timeSignatures[i];
+    const tsPosition = tsPositions[i];
+    const nextTs = timeSignatures[i + 1];
+    const measureDuration = getMeasureDuration(ts.beats, ts.beatType, tpqn);
+    const numOfMeasures = nextTs.measureNumber - ts.measureNumber;
+    const nextTsPosition = tsPosition + measureDuration * numOfMeasures;
+    tsPositions.push(nextTsPosition);
+  }
+  return tsPositions;
+}
+
+export function tickToMeasureNumber(
+  ticks: number,
+  timeSignatures: TimeSignature[],
+  tpqn: number
+) {
+  const tsPositions = getTimeSignaturePositions(timeSignatures, tpqn);
+  const nextTsIndex = tsPositions.findIndex((value) => ticks < value);
+  const lastTsIndex = tsPositions.length - 1;
+  const tsIndex = nextTsIndex !== -1 ? nextTsIndex - 1 : lastTsIndex;
+  const ts = timeSignatures[tsIndex];
+  const tsPosition = tsPositions[tsIndex];
+  const ticksWithinTs = ticks - tsPosition;
+  const measureDuration = getMeasureDuration(ts.beats, ts.beatType, tpqn);
+  return ts.measureNumber + Math.floor(ticksWithinTs / measureDuration);
+}
+
 // NOTE: 戻り値の単位はtick
 export function getMeasureDuration(
   beats: number,
@@ -17,14 +58,24 @@ export function getMeasureDuration(
   return (wholeNoteDuration / beatType) * beats;
 }
 
-// TODO: getNumOfMeasuresに変更する
-export function getMeasureNum(notes: Note[], measureDuration: number) {
-  if (notes.length === 0) {
-    return 0;
+export function getNumOfMeasures(
+  notes: Note[],
+  tempos: Tempo[],
+  timeSignatures: TimeSignature[],
+  tpqn: number
+) {
+  const tsPositions = getTimeSignaturePositions(timeSignatures, tpqn);
+  let maxTicks = 0;
+  const lastTsPosition = tsPositions[tsPositions.length - 1];
+  const lastTempoPosition = tempos[tempos.length - 1].position;
+  maxTicks = Math.max(maxTicks, lastTsPosition);
+  maxTicks = Math.max(maxTicks, lastTempoPosition);
+  if (notes.length > 0) {
+    const lastNote = notes[notes.length - 1];
+    const lastNoteEndPosition = lastNote.position + lastNote.duration;
+    maxTicks = Math.max(maxTicks, lastNoteEndPosition);
   }
-  const lastNote = notes[notes.length - 1];
-  const maxTicks = lastNote.position + lastNote.duration;
-  return Math.ceil(maxTicks / measureDuration);
+  return tickToMeasureNumber(maxTicks, timeSignatures, tpqn);
 }
 
 // NOTE: 戻り値の単位はtick
@@ -159,3 +210,23 @@ export function round(value: number, digits: number) {
   const powerOf10 = 10 ** digits;
   return Math.round(value * powerOf10) / powerOf10;
 }
+
+export const createEmptyScore = (): Score => {
+  return {
+    tpqn: DEFAULT_TPQN,
+    tempos: [
+      {
+        position: 0,
+        tempo: DEFAULT_TEMPO,
+      },
+    ],
+    timeSignatures: [
+      {
+        measureNumber: 1,
+        beats: DEFAULT_BEATS,
+        beatType: DEFAULT_BEAT_TYPE,
+      },
+    ],
+    notes: [],
+  };
+};
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 8a4681b0ea..aff19d632c 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -29,7 +29,14 @@ import {
 } from "@/infrastructures/AudioRenderer";
 import { EngineId, StyleId } from "@/type/preload";
 import {
+  BEAT_TYPES,
+  DEFAULT_BEATS,
+  DEFAULT_BEAT_TYPE,
+  DEFAULT_TEMPO,
+  DEFAULT_TPQN,
+  createEmptyScore,
   getDoremiFromNoteNumber,
+  getMeasureDuration,
   isValidSnapType,
   noteNumberToFrequency,
   round,
@@ -187,6 +194,14 @@ const generateAudioQueryHash = async (obj: AudioQuery) => {
   return _generateHash(obj);
 };
 
+const isValidTpqn = (tpqn: number) => {
+  return (
+    Number.isInteger(tpqn) &&
+    BEAT_TYPES.every((value) => tpqn % value === 0) &&
+    tpqn % 3 === 0
+  );
+};
+
 const isValidTempo = (tempo: Tempo) => {
   return (
     Number.isInteger(tempo.position) &&
@@ -196,14 +211,17 @@ const isValidTempo = (tempo: Tempo) => {
   );
 };
 
+const isValidBeatType = (beatType: number) => {
+  return Number.isInteger(beatType) && BEAT_TYPES.includes(beatType);
+};
+
 const isValidTimeSignature = (timeSignature: TimeSignature) => {
   return (
-    Number.isInteger(timeSignature.position) &&
+    Number.isInteger(timeSignature.measureNumber) &&
     Number.isInteger(timeSignature.beats) &&
-    Number.isInteger(timeSignature.beatType) &&
-    timeSignature.position >= 0 &&
+    timeSignature.measureNumber > 0 &&
     timeSignature.beats > 0 &&
-    timeSignature.beatType > 0
+    isValidBeatType(timeSignature.beatType)
   );
 };
 
@@ -230,11 +248,15 @@ const isValidTempos = (tempos: Tempo[]) => {
 const isValidTimeSignatures = (timeSignatures: TimeSignature[]) => {
   return (
     timeSignatures.length > 0 &&
-    timeSignatures[0].position === 0 &&
+    timeSignatures[0].measureNumber === 1 &&
     timeSignatures.every((value) => isValidTimeSignature(value))
   );
 };
 
+const isValidNotes = (notes: Note[]) => {
+  return notes.every((value) => isValidNote(value));
+};
+
 const getFromOptional = <T>(value: T | undefined): T => {
   if (value === undefined) {
     throw new Error("The value is undefined.");
@@ -242,31 +264,6 @@ const getFromOptional = <T>(value: T | undefined): T => {
   return value;
 };
 
-const DEFAULT_TPQN = 480;
-const DEFAULT_TEMPO = 120;
-const DEFAULT_BEATS = 4;
-const DEFAULT_BEAT_TYPE = 4;
-
-const createEmptyScore = (): Score => {
-  return {
-    tpqn: DEFAULT_TPQN,
-    tempos: [
-      {
-        position: 0,
-        tempo: DEFAULT_TEMPO,
-      },
-    ],
-    timeSignatures: [
-      {
-        position: 0,
-        beats: DEFAULT_BEATS,
-        beatType: DEFAULT_BEAT_TYPE,
-      },
-    ],
-    notes: [],
-  };
-};
-
 let audioContext: AudioContext | undefined;
 let transport: Transport | undefined;
 let channelStrip: ChannelStrip | undefined;
@@ -379,12 +376,18 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       { state, getters, commit, dispatch },
       { score }: { score: Score }
     ) {
+      if (!isValidTpqn(score.tpqn)) {
+        throw new Error("The tpqn is invalid.");
+      }
       if (!isValidTempos(score.tempos)) {
         throw new Error("The tempos are invalid.");
       }
       if (!isValidTimeSignatures(score.timeSignatures)) {
         throw new Error("The time signatures are invalid.");
       }
+      if (!isValidNotes(score.notes)) {
+        throw new Error("The notes are invalid.");
+      }
       if (!transport) {
         throw new Error("transport is undefined.");
       }
@@ -484,14 +487,14 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     mutation(state, { timeSignature }: { timeSignature: TimeSignature }) {
       const score = getFromOptional(state.score);
       const index = score.timeSignatures.findIndex((value) => {
-        return value.position === timeSignature.position;
+        return value.measureNumber === timeSignature.measureNumber;
       });
       const timeSignatures = [...score.timeSignatures];
       if (index !== -1) {
         timeSignatures.splice(index, 1, timeSignature);
       } else {
         timeSignatures.push(timeSignature);
-        timeSignatures.sort((a, b) => a.position - b.position);
+        timeSignatures.sort((a, b) => a.measureNumber - b.measureNumber);
       }
       score.timeSignatures = timeSignatures;
     },
@@ -508,10 +511,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   },
 
   REMOVE_TIME_SIGNATURE: {
-    mutation(state, { position }: { position: number }) {
+    mutation(state, { measureNumber }: { measureNumber: number }) {
       const score = getFromOptional(state.score);
       const index = score.timeSignatures.findIndex((value) => {
-        return value.position === position;
+        return value.measureNumber === measureNumber;
       });
       if (index === -1) {
         throw new Error("The time signature does not exist.");
@@ -519,7 +522,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       const timeSignatures = [...score.timeSignatures];
       if (index === 0) {
         timeSignatures.splice(index, 1, {
-          position: 0,
+          measureNumber: 1,
           beats: DEFAULT_BEATS,
           beatType: DEFAULT_BEAT_TYPE,
         });
@@ -529,15 +532,18 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       score.timeSignatures = timeSignatures;
     },
     // 拍子を削除する。先頭の拍子の場合はデフォルトの拍子に置き換える。
-    async action({ state, commit }, { position }: { position: number }) {
+    async action(
+      { state, commit },
+      { measureNumber }: { measureNumber: number }
+    ) {
       const score = getFromOptional(state.score);
       const exists = score.timeSignatures.some((value) => {
-        return value.position === position;
+        return value.measureNumber === measureNumber;
       });
       if (!exists) {
         throw new Error("The time signature does not exist.");
       }
-      commit("REMOVE_TIME_SIGNATURE", { position });
+      commit("REMOVE_TIME_SIGNATURE", { measureNumber });
     },
   },
 
@@ -1346,7 +1352,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return timeSignatures.filter((value, index, array) => {
             return (
               index === array.length - 1 ||
-              value.position !== array[index + 1].position
+              value.measureNumber !== array[index + 1].measureNumber
             );
           });
         };
@@ -1406,20 +1412,33 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         });
         tempos = removeDuplicateTempos(tempos);
 
-        let timeSignatures = midiTimeSignatures.map((value): TimeSignature => {
-          return {
-            position: convertPosition(value.ticks, midiTpqn, tpqn),
-            beats: value.timeSignature[0],
-            beatType: value.timeSignature[1],
-          };
-        });
+        let timeSignatures: TimeSignature[] = [];
+        let tsPosition = 0;
+        let measureNumber = 1;
+        for (let i = 0; i < midiTimeSignatures.length; i++) {
+          const midiTs = midiTimeSignatures[i];
+          const beats = midiTs.timeSignature[0];
+          const beatType = midiTs.timeSignature[1];
+          timeSignatures.push({ measureNumber, beats, beatType });
+          if (i < midiTimeSignatures.length - 1) {
+            const nextTsTicks = midiTimeSignatures[i + 1].ticks;
+            const nextTsPos = convertPosition(nextTsTicks, midiTpqn, tpqn);
+            const tsDuration = nextTsPos - tsPosition;
+            const measureDuration = getMeasureDuration(beats, beatType, tpqn);
+            tsPosition = nextTsPos;
+            measureNumber += tsDuration / measureDuration;
+          }
+        }
         timeSignatures.unshift({
-          position: 0,
+          measureNumber: 1,
           beats: DEFAULT_BEATS,
           beatType: DEFAULT_BEAT_TYPE,
         });
         timeSignatures = removeDuplicateTimeSignatures(timeSignatures);
 
+        tempos.splice(1, tempos.length - 1); // TODO: 複数テンポに対応したら削除
+        timeSignatures.splice(1, timeSignatures.length - 1); // TODO: 複数拍子に対応したら削除
+
         await dispatch("SET_SCORE", {
           score: {
             tpqn,
@@ -1453,15 +1472,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           );
         }
 
-        const getMeasureDuration = (
-          beats: number,
-          beatType: number,
-          tpqn: number
-        ) => {
-          const wholeNoteDuration = tpqn * 4;
-          return Math.round((wholeNoteDuration / beatType) * beats);
-        };
-
         const tpqn = DEFAULT_TPQN;
         const tempos: Tempo[] = [
           {
@@ -1471,7 +1481,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         ];
         const timeSignatures: TimeSignature[] = [
           {
-            position: 0,
+            measureNumber: 1,
             beats: DEFAULT_BEATS,
             beatType: DEFAULT_BEAT_TYPE,
           },
@@ -1480,6 +1490,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         let divisions = 1;
         let position = 0;
+        let measureNumber = 1;
         let measurePosition = 0;
         let measureDuration = getMeasureDuration(
           timeSignatures[0].beats,
@@ -1603,12 +1614,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           measureDuration = getMeasureDuration(beats, beatType, tpqn);
           if (timeSignatures.length !== 0) {
             const lastTimeSignature = timeSignatures[timeSignatures.length - 1];
-            if (lastTimeSignature.position === position) {
+            if (lastTimeSignature.measureNumber === measureNumber) {
               timeSignatures.pop();
             }
           }
           timeSignatures.push({
-            position,
+            measureNumber,
             beats,
             beatType,
           });
@@ -1705,6 +1716,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         const parseMeasure = (measureElement: Element) => {
           measurePosition = position;
+          measureNumber = getAttributeAsNumber(measureElement, "number");
           for (const childElement of measureElement.children) {
             if (childElement.tagName === "direction") {
               parseDirection(childElement);
@@ -1746,6 +1758,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         parseMusicXml(xmlStr);
 
+        tempos.splice(1, tempos.length - 1); // TODO: 複数テンポに対応したら削除
+        timeSignatures.splice(1, timeSignatures.length - 1); // TODO: 複数拍子に対応したら削除
+
         await dispatch("SET_SCORE", {
           score: {
             tpqn,
diff --git a/src/store/type.ts b/src/store/type.ts
index c331d5f2d8..c39c47ede8 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -720,7 +720,7 @@ export type Tempo = {
 };
 
 export type TimeSignature = {
-  position: number;
+  measureNumber: number;
   beats: number;
   beatType: number;
 };
@@ -795,8 +795,8 @@ export type SingingStoreTypes = {
   };
 
   REMOVE_TIME_SIGNATURE: {
-    mutation: { position: number };
-    action(payload: { position: number }): void;
+    mutation: { measureNumber: number };
+    action(payload: { measureNumber: number }): void;
   };
 
   ADD_NOTE: {
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index ae375ed0bc..7449efde16 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -21,6 +21,7 @@ import {
   //watch,
 } from "vue";
 import { useStore } from "@/store";
+import { createEmptyScore } from "@/helpers/singHelper";
 // import { QResizeObserver, useQuasar } from "quasar";
 // import path from "path";
 
@@ -48,6 +49,7 @@ export default defineComponent({
 
     // 歌声合成エディターの初期化
     onMounted(async () => {
+      await store.dispatch("SET_SCORE", { score: createEmptyScore() });
       await store.dispatch("SET_SINGER", {});
 
       await store.dispatch("SET_VOLUME", { volume: 0.3 });

From 0def6f094e07b3c5aa4b9221c510259d345aa3bc Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Thu, 26 Oct 2023 23:24:48 +0900
Subject: [PATCH 26/59] =?UTF-8?q?[project-s]=20state.score=E3=81=8B?=
 =?UTF-8?q?=E3=82=89undefined=E3=82=92=E6=B6=88=E3=81=99=20(#1622)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScorePosition.vue | 2 +-
 src/components/SingerTab.vue          | 2 +-
 src/store/type.ts                     | 2 +-
 tests/unit/store/Vuex.spec.ts         | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Sing/ScorePosition.vue b/src/components/Sing/ScorePosition.vue
index ef210f0c05..3d3acb9bb9 100644
--- a/src/components/Sing/ScorePosition.vue
+++ b/src/components/Sing/ScorePosition.vue
@@ -9,7 +9,7 @@ export default defineComponent({
   name: "SingScorePosition",
 
   setup() {
-    return null;
+    return {};
   },
 });
 </script>
diff --git a/src/components/SingerTab.vue b/src/components/SingerTab.vue
index ae3e00ade0..311b1461c9 100644
--- a/src/components/SingerTab.vue
+++ b/src/components/SingerTab.vue
@@ -21,7 +21,7 @@ export default defineComponent({
     onMounted(async () => {
       return null;
     });
-    return null;
+    return {};
   },
 });
 </script>
diff --git a/src/store/type.ts b/src/store/type.ts
index c39c47ede8..1bb245bc5d 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -743,7 +743,7 @@ export type Score = {
 export type SingingStoreState = {
   engineId?: EngineId;
   styleId?: StyleId;
-  score?: Score;
+  score: Score;
   // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
   isShowSinger: boolean;
   // NOTE: オーディオ再生はボイスと同様もしくは拡張して使う？
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 22c2a9afad..f7a9c0a867 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -15,6 +15,7 @@ import { dictionaryStore } from "@/store/dictionary";
 import { engineStore } from "@/store/engine";
 import { singingStore } from "@/store/singing";
 import { EngineId } from "@/type/preload";
+import { createEmptyScore } from "@/helpers/singHelper";
 const isDevelopment = process.env.NODE_ENV == "development";
 // TODO: Swap external files to Mock
 
@@ -148,6 +149,7 @@ describe("store/vuex.js test", () => {
         progress: -1,
         isVuexReady: false,
         defaultPresetKeys: {},
+        score: createEmptyScore(),
         isShowSinger: true,
         sequencerZoomX: 1,
         sequencerZoomY: 1,

From 1c727ea3da98ebb8d66ac9b882d66dce94cd6d75 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sat, 28 Oct 2023 19:58:04 +0900
Subject: [PATCH 27/59] =?UTF-8?q?[project-s]=20=E3=83=87=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E6=A7=8B=E9=80=A0=E3=81=AE=E6=95=B4=E7=90=86=E3=81=A8=E3=83=AA?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=20(#1625)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/CharacterMenuButton.vue |  13 +-
 src/components/Sing/ScoreSequencer.vue      |  54 +---
 src/components/Sing/SequencerNote.vue       |   2 +-
 src/components/Sing/SingerPanel.vue         |  14 +-
 src/components/Sing/ToolBar.vue             |  81 +++---
 src/helpers/singHelper.ts                   |  24 +-
 src/store/singing.ts                        | 286 ++++++++++----------
 src/store/type.ts                           |  16 +-
 src/views/SingerHome.vue                    |  27 +-
 tests/unit/store/Vuex.spec.ts               |  19 +-
 10 files changed, 255 insertions(+), 281 deletions(-)

diff --git a/src/components/Sing/CharacterMenuButton.vue b/src/components/Sing/CharacterMenuButton.vue
index c76b162164..8ac6f97755 100644
--- a/src/components/Sing/CharacterMenuButton.vue
+++ b/src/components/Sing/CharacterMenuButton.vue
@@ -185,7 +185,7 @@ export default defineComponent({
           `No engineId for target character style (speakerUuid == ${speakerUuid}, styleId == ${styleId})`
         );
 
-      store.dispatch("SET_SINGER", { engineId, styleId });
+      store.dispatch("SET_SINGER", { singer: { engineId, styleId } });
     };
 
     const getDefaultStyle = (speakerUuid: string) => {
@@ -210,13 +210,12 @@ export default defineComponent({
     const selectedCharacterInfo = computed(() => {
       if (
         userOrderedCharacterInfos.value === undefined ||
-        store.state.engineId === undefined ||
-        store.state.styleId === undefined
+        store.state.singer === undefined
       )
         return undefined;
       return store.getters.CHARACTER_INFO(
-        store.state.engineId,
-        store.state.styleId
+        store.state.singer.engineId,
+        store.state.singer.styleId
       );
     });
 
@@ -228,8 +227,8 @@ export default defineComponent({
       () =>
         selectedCharacterInfo.value?.metas.styles.find(
           (style) =>
-            style.styleId === store.state.styleId &&
-            style.engineId === store.state.engineId
+            style.styleId === store.state.singer?.styleId &&
+            style.engineId === store.state.singer?.engineId
         )?.styleId
     );
 
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 1953c226e5..2d965d219a 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -171,32 +171,13 @@ export default defineComponent({
     const dragMoveCurrentY = ref();
     const dragDurationCurrentX = ref();
     // 分解能（Ticks Per Quarter Note）
-    const tpqn = computed(() => state.score?.tpqn ?? 480);
+    const tpqn = computed(() => state.score.tpqn);
     // ノート
-    const notes = computed(() => state.score?.notes ?? []);
+    const notes = computed(() => state.score.notes);
     // テンポ
-    const tempos = computed(() => {
-      return (
-        state.score?.tempos ?? [
-          {
-            position: 0,
-            tempo: 120,
-          },
-        ]
-      );
-    });
+    const tempos = computed(() => state.score.tempos);
     // 拍子
-    const timeSignatures = computed(() => {
-      return (
-        state.score?.timeSignatures ?? [
-          {
-            measureNumber: 1,
-            beats: 4,
-            beatType: 4,
-          },
-        ]
-      );
-    });
+    const timeSignatures = computed(() => state.score.timeSignatures);
     // ズーム状態
     const zoomX = computed(() => state.sequencerZoomX);
     const zoomY = computed(() => state.sequencerZoomY);
@@ -314,9 +295,6 @@ export default defineComponent({
 
     // ドラッグでのノートの移動
     const dragMove = () => {
-      if (!state.score) {
-        throw new Error("Score is undefined.");
-      }
       if (dragMode.value !== DragMode.MOVE) {
         cancelAnimationFrame(dragId.value);
         return;
@@ -345,7 +323,7 @@ export default defineComponent({
 
       // 選択中のノートのpositionとnoteNumberを変更
       let isNotesChanged = false;
-      const newNotes = [...state.score.notes].map((note) => {
+      const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
           if (amountPositionX === 0 && amountPositionY === 0) {
             return note;
@@ -389,9 +367,6 @@ export default defineComponent({
     // ノート右ドラッグ
     // FIXME: 左右ドラッグロジックを統一する
     const dragRight = () => {
-      if (!state.score) {
-        throw new Error("Score is undefined.");
-      }
       if (dragMode.value !== DragMode.NOTE_RIGHT) {
         cancelAnimationFrame(dragId.value);
         return;
@@ -399,7 +374,7 @@ export default defineComponent({
       const distanceX = cursorX.value - dragDurationCurrentX.value;
       if (snapWidth.value <= Math.abs(distanceX)) {
         let isNotesChanged = false;
-        const newNotes = [...state.score.notes].map((note) => {
+        const newNotes = state.score.notes.map((note) => {
           if (selectedNoteIds.value.includes(note.id)) {
             const duration =
               note.duration +
@@ -441,9 +416,6 @@ export default defineComponent({
     // ノート左ドラッグ
     // FIXME: 左右ドラッグロジックを統一する
     const dragLeft = () => {
-      if (!state.score) {
-        throw new Error("Score is undefined.");
-      }
       if (dragMode.value !== DragMode.NOTE_LEFT) {
         cancelAnimationFrame(dragId.value);
         return;
@@ -451,7 +423,7 @@ export default defineComponent({
       const distanceX = cursorX.value - dragDurationCurrentX.value;
       if (snapWidth.value <= Math.abs(distanceX)) {
         let isNotesChanged = false;
-        const newNotes = [...state.score.notes].map((note) => {
+        const newNotes = state.score.notes.map((note) => {
           if (selectedNoteIds.value.includes(note.id)) {
             const position =
               note.position +
@@ -516,9 +488,6 @@ export default defineComponent({
 
     // キーボードイベント
     const handleNotesArrowUp = () => {
-      if (!state.score) {
-        throw new Error("Score is undefined.");
-      }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
           const noteNumber = Math.min(note.noteNumber + 1, 127);
@@ -537,9 +506,6 @@ export default defineComponent({
     };
 
     const handleNotesArrowDown = () => {
-      if (!state.score) {
-        throw new Error("Score is undefined.");
-      }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
           const noteNumber = Math.max(note.noteNumber - 1, 0);
@@ -558,9 +524,6 @@ export default defineComponent({
     };
 
     const handleNotesArrowRight = () => {
-      if (!state.score) {
-        throw new Error("Score is undefined.");
-      }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
           const position = note.position + snapTicks.value;
@@ -576,9 +539,6 @@ export default defineComponent({
     };
 
     const handleNotesArrowLeft = () => {
-      if (!state.score) {
-        throw new Error("Score is undefined.");
-      }
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
           const position = note.position - snapTicks.value;
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 9834ded9e2..e2310f434f 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -84,7 +84,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const store = useStore();
     const state = store.state;
-    const tpqn = computed(() => state.score?.tpqn ?? 480);
+    const tpqn = computed(() => state.score.tpqn);
     const zoomX = computed(() => state.sequencerZoomX);
     const zoomY = computed(() => state.sequencerZoomY);
     const positionX = computed(() => {
diff --git a/src/components/Sing/SingerPanel.vue b/src/components/Sing/SingerPanel.vue
index ef9c1aadda..329f493b11 100644
--- a/src/components/Sing/SingerPanel.vue
+++ b/src/components/Sing/SingerPanel.vue
@@ -31,16 +31,18 @@ export default defineComponent({
     );
 
     const characterInfo = computed(() => {
-      const engineId = store.state.engineId;
-      const styleId = store.state.styleId;
-      if (userOrderedCharacterInfos.value === undefined) return undefined;
-      if (engineId === undefined || styleId === undefined) return undefined;
-      return store.getters.CHARACTER_INFO(engineId, styleId);
+      if (!userOrderedCharacterInfos.value || !store.state.singer) {
+        return undefined;
+      }
+      return store.getters.CHARACTER_INFO(
+        store.state.singer.engineId,
+        store.state.singer.styleId
+      );
     });
 
     const characterName = computed(() => {
       const style = characterInfo.value?.metas.styles.find(
-        (style) => style.styleId === store.state.styleId
+        (style) => style.styleId === store.state.singer?.styleId
       );
       return style?.styleName
         ? `${characterInfo.value?.metas.speakerName} (${style?.styleName})`
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index ef97bd8b93..7ea79f5788 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -33,11 +33,11 @@
       <div class="sing-playback-position">{{ playbackPositionStr }}</div>
       <q-input
         type="number"
-        :model-value="tempoInputBuffer"
+        :model-value="bpmInputBuffer"
         dense
         hide-bottom-space
         class="sing-tempo"
-        @update:model-value="setTempoInputBuffer"
+        @update:model-value="setBpmInputBuffer"
         @change="setTempo"
       >
         <template #prepend>
@@ -110,35 +110,35 @@ export default defineComponent({
     const userOrderedCharacterInfos = computed(
       () => store.getters.USER_ORDERED_CHARACTER_INFOS
     );
-    const selectedCharacterInfo = computed(() =>
-      userOrderedCharacterInfos.value !== undefined &&
-      store.state.engineId !== undefined &&
-      store.state.styleId !== undefined
-        ? store.getters.CHARACTER_INFO(
-            store.state.engineId,
-            store.state.styleId
-          )
-        : undefined
-    );
-    const selectedStyleIconPath = computed(
-      () =>
-        selectedCharacterInfo.value?.metas.styles.find(
-          (style) =>
-            style.styleId === store.state.styleId &&
-            style.engineId === store.state.engineId
-        )?.iconPath
-    );
+    const selectedCharacterInfo = computed(() => {
+      if (!userOrderedCharacterInfos.value || !store.state.singer) {
+        return undefined;
+      }
+      return store.getters.CHARACTER_INFO(
+        store.state.singer.engineId,
+        store.state.singer.styleId
+      );
+    });
+    const selectedStyleIconPath = computed(() => {
+      const styles = selectedCharacterInfo.value?.metas.styles;
+      return styles?.find((style) => {
+        return (
+          style.styleId === store.state.singer?.styleId &&
+          style.engineId === store.state.singer?.engineId
+        );
+      })?.iconPath;
+    });
 
-    const tempoInputBuffer = ref(0);
+    const bpmInputBuffer = ref(0);
     const beatsInputBuffer = ref(0);
     const beatTypeInputBuffer = ref(0);
 
-    const setTempoInputBuffer = (tempoStr: string | number | null) => {
-      const tempo = Number(tempoStr);
-      if (!Number.isFinite(tempo) || tempo <= 0) {
+    const setBpmInputBuffer = (bpmStr: string | number | null) => {
+      const bpm = Number(bpmStr);
+      if (!Number.isFinite(bpm) || bpm <= 0) {
         return;
       }
-      tempoInputBuffer.value = tempo;
+      bpmInputBuffer.value = bpm;
     };
     const setBeatsInputBuffer = (beatsStr: string | number | null) => {
       const beats = Number(beatsStr);
@@ -158,10 +158,7 @@ export default defineComponent({
     const playPos = ref(0);
 
     const playbackPositionStr = computed(() => {
-      let playTime = 0;
-      if (store.state.score) {
-        playTime = store.getters.TICK_TO_SECOND(playPos.value);
-      }
+      const playTime = store.getters.TICK_TO_SECOND(playPos.value);
 
       const intPlayTime = Math.floor(playTime);
       const min = Math.floor(intPlayTime / 60);
@@ -173,22 +170,22 @@ export default defineComponent({
       return `${minStr}:${secStr}.${milliSecStr}`;
     });
 
-    const tempos = computed(() => store.state.score?.tempos);
-    const timeSignatures = computed(() => store.state.score?.timeSignatures);
+    const tempos = computed(() => store.state.score.tempos);
+    const timeSignatures = computed(() => store.state.score.timeSignatures);
     const nowPlaying = computed(() => store.state.nowPlaying);
 
     watch(
       tempos,
       () => {
-        tempoInputBuffer.value = tempos.value?.[0].tempo ?? 0;
+        bpmInputBuffer.value = tempos.value[0].bpm;
       },
       { deep: true }
     );
     watch(
       timeSignatures,
       () => {
-        beatsInputBuffer.value = timeSignatures.value?.[0].beats ?? 0;
-        beatTypeInputBuffer.value = timeSignatures.value?.[0].beatType ?? 0;
+        beatsInputBuffer.value = timeSignatures.value[0].beats;
+        beatTypeInputBuffer.value = timeSignatures.value[0].beatType;
       },
       { deep: true }
     );
@@ -209,12 +206,12 @@ export default defineComponent({
     });
 
     const setTempo = async () => {
-      const tempo = tempoInputBuffer.value;
-      if (tempo === 0) return;
+      const bpm = bpmInputBuffer.value;
+      if (bpm === 0) return;
       await store.dispatch("SET_TEMPO", {
         tempo: {
           position: 0,
-          tempo: tempo,
+          bpm,
         },
       });
     };
@@ -226,8 +223,8 @@ export default defineComponent({
       await store.dispatch("SET_TIME_SIGNATURE", {
         timeSignature: {
           measureNumber: 1,
-          beats: beats,
-          beatType: beatType,
+          beats,
+          beatType,
         },
       });
     };
@@ -255,7 +252,7 @@ export default defineComponent({
     });
 
     const snapTypeSelectOptions = computed(() => {
-      const tpqn = store.state.score?.tpqn ?? 480;
+      const tpqn = store.state.score.tpqn;
       return getSnapTypes(tpqn)
         .sort((a, b) => {
           if (isTriplet(a) === isTriplet(b)) {
@@ -292,10 +289,10 @@ export default defineComponent({
       isShowSinger,
       toggleShowSinger,
       selectedStyleIconPath,
-      tempoInputBuffer,
+      bpmInputBuffer,
       beatsInputBuffer,
       beatTypeInputBuffer,
-      setTempoInputBuffer,
+      setBpmInputBuffer,
       setBeatsInputBuffer,
       setBeatTypeInputBuffer,
       setTempo,
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index e138518499..87f086d973 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -1,9 +1,9 @@
-import { Note, Score, Tempo, TimeSignature } from "@/store/type";
+import { Note, Tempo, TimeSignature } from "@/store/type";
 
 export const BEAT_TYPES = [2, 4, 8, 16];
 
 export const DEFAULT_TPQN = 480;
-export const DEFAULT_TEMPO = 120;
+export const DEFAULT_BPM = 120;
 export const DEFAULT_BEATS = 4;
 export const DEFAULT_BEAT_TYPE = 4;
 
@@ -210,23 +210,3 @@ export function round(value: number, digits: number) {
   const powerOf10 = 10 ** digits;
   return Math.round(value * powerOf10) / powerOf10;
 }
-
-export const createEmptyScore = (): Score => {
-  return {
-    tpqn: DEFAULT_TPQN,
-    tempos: [
-      {
-        position: 0,
-        tempo: DEFAULT_TEMPO,
-      },
-    ],
-    timeSignatures: [
-      {
-        measureNumber: 1,
-        beats: DEFAULT_BEATS,
-        beatType: DEFAULT_BEAT_TYPE,
-      },
-    ],
-    notes: [],
-  };
-};
diff --git a/src/store/singing.ts b/src/store/singing.ts
index aff19d632c..4b28dacefa 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -9,6 +9,7 @@ import {
   SingingStoreState,
   SingingStoreTypes,
   SaveResultObject,
+  Singer,
 } from "./type";
 import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
@@ -27,14 +28,12 @@ import {
   Sequence,
   Transport,
 } from "@/infrastructures/AudioRenderer";
-import { EngineId, StyleId } from "@/type/preload";
 import {
   BEAT_TYPES,
   DEFAULT_BEATS,
   DEFAULT_BEAT_TYPE,
-  DEFAULT_TEMPO,
+  DEFAULT_BPM,
   DEFAULT_TPQN,
-  createEmptyScore,
   getDoremiFromNoteNumber,
   getMeasureDuration,
   isValidSnapType,
@@ -44,21 +43,23 @@ import {
 import { AudioQuery, Mora } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
 
-const tickToSecondForConstantTempo = (
+const tickToSecondForConstantBpm = (
   ticks: number,
-  tempo: number,
+  bpm: number,
   tpqn: number
 ) => {
-  const quarterNotesPerSecond = tempo / 60;
+  const quarterNotesPerMinute = bpm;
+  const quarterNotesPerSecond = quarterNotesPerMinute / 60;
   return ticks / tpqn / quarterNotesPerSecond;
 };
 
-const secondToTickForConstantTempo = (
+const secondToTickForConstantBpm = (
   seconds: number,
-  tempo: number,
+  bpm: number,
   tpqn: number
 ) => {
-  const quarterNotesPerSecond = tempo / 60;
+  const quarterNotesPerMinute = bpm;
+  const quarterNotesPerSecond = quarterNotesPerMinute / 60;
   return seconds * quarterNotesPerSecond * tpqn;
 };
 
@@ -73,15 +74,15 @@ const tickToSecond = (ticks: number, tempos: Tempo[], tpqn: number) => {
       tempo = tempos[i];
       break;
     }
-    timeOfTempo += tickToSecondForConstantTempo(
+    timeOfTempo += tickToSecondForConstantBpm(
       tempos[i + 1].position - tempos[i].position,
-      tempos[i].tempo,
+      tempos[i].bpm,
       tpqn
     );
   }
   return (
     timeOfTempo +
-    tickToSecondForConstantTempo(ticks - tempo.position, tempo.tempo, tpqn)
+    tickToSecondForConstantBpm(ticks - tempo.position, tempo.bpm, tpqn)
   );
 };
 
@@ -94,9 +95,9 @@ const secondToTick = (seconds: number, tempos: Tempo[], tpqn: number) => {
     }
     const timeOfNextTempo =
       timeOfTempo +
-      tickToSecondForConstantTempo(
+      tickToSecondForConstantBpm(
         tempos[i + 1].position - tempos[i].position,
-        tempos[i].tempo,
+        tempos[i].bpm,
         tpqn
       );
     if (timeOfNextTempo > seconds) {
@@ -107,7 +108,7 @@ const secondToTick = (seconds: number, tempos: Tempo[], tpqn: number) => {
   }
   return (
     tempo.position +
-    secondToTickForConstantTempo(seconds - timeOfTempo, tempo.tempo, tpqn)
+    secondToTickForConstantBpm(seconds - timeOfTempo, tempo.bpm, tpqn)
   );
 };
 
@@ -142,6 +143,16 @@ const copyScore = (score: Score): Score => {
   };
 };
 
+const copySinger = (singer?: Singer): Singer | undefined => {
+  if (!singer) {
+    return undefined;
+  }
+  return {
+    engineId: singer.engineId,
+    styleId: singer.styleId,
+  };
+};
+
 const _generateHash = async <T>(obj: T) => {
   const textEncoder = new TextEncoder();
   const data = textEncoder.encode(JSON.stringify(obj));
@@ -166,11 +177,6 @@ const createPromiseThatResolvesWhen = (
   });
 };
 
-type Singer = {
-  readonly engineId: EngineId;
-  readonly styleId: StyleId;
-};
-
 type Phrase = {
   readonly singer: Singer | undefined;
   readonly score: Score;
@@ -205,9 +211,9 @@ const isValidTpqn = (tpqn: number) => {
 const isValidTempo = (tempo: Tempo) => {
   return (
     Number.isInteger(tempo.position) &&
-    Number.isFinite(tempo.tempo) &&
+    Number.isFinite(tempo.bpm) &&
     tempo.position >= 0 &&
-    tempo.tempo > 0
+    tempo.bpm > 0
   );
 };
 
@@ -257,11 +263,13 @@ const isValidNotes = (notes: Note[]) => {
   return notes.every((value) => isValidNote(value));
 };
 
-const getFromOptional = <T>(value: T | undefined): T => {
-  if (value === undefined) {
-    throw new Error("The value is undefined.");
-  }
-  return value;
+const isValidScore = (score: Score) => {
+  return (
+    isValidTpqn(score.tpqn) &&
+    isValidTempos(score.tempos) &&
+    isValidTimeSignatures(score.timeSignatures) &&
+    isValidNotes(score.notes)
+  );
 };
 
 let audioContext: AudioContext | undefined;
@@ -288,9 +296,24 @@ const allPhrases = new Map<string, Phrase>();
 const phraseAudioBlobCache = new Map<string, Blob>();
 
 export const singingStoreState: SingingStoreState = {
-  engineId: undefined,
-  styleId: undefined,
-  score: createEmptyScore(),
+  singer: undefined,
+  score: {
+    tpqn: DEFAULT_TPQN,
+    tempos: [
+      {
+        position: 0,
+        bpm: DEFAULT_BPM,
+      },
+    ],
+    timeSignatures: [
+      {
+        measureNumber: 1,
+        beats: DEFAULT_BEATS,
+        beatType: DEFAULT_BEAT_TYPE,
+      },
+    ],
+    notes: [],
+  },
   // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
   isShowSinger: true,
   sequencerZoomX: 0.5,
@@ -322,25 +345,24 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   },
 
   SET_SINGER: {
-    mutation(
-      state,
-      { engineId, styleId }: { engineId: EngineId; styleId: StyleId }
-    ) {
-      state.engineId = engineId;
-      state.styleId = styleId;
+    mutation(state, { singer }: { singer?: Singer }) {
+      state.singer = singer;
     },
-    async action({ state, getters, dispatch, commit }, payload) {
+    async action(
+      { state, getters, dispatch, commit },
+      { singer }: { singer?: Singer }
+    ) {
       if (state.defaultStyleIds == undefined)
         throw new Error("state.defaultStyleIds == undefined");
       if (getters.USER_ORDERED_CHARACTER_INFOS == undefined)
         throw new Error("state.characterInfos == undefined");
       const userOrderedCharacterInfos = getters.USER_ORDERED_CHARACTER_INFOS;
 
-      const engineId = payload.engineId ?? state.engineIds[0];
+      const engineId = singer?.engineId ?? state.engineIds[0];
 
       // FIXME: engineIdも含めて探査する
       const styleId =
-        payload.styleId ??
+        singer?.styleId ??
         state.defaultStyleIds[
           state.defaultStyleIds.findIndex(
             (x) =>
@@ -361,7 +383,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           });
         }
       } finally {
-        commit("SET_SINGER", { engineId, styleId });
+        commit("SET_SINGER", { singer: { engineId, styleId } });
 
         dispatch("RENDER");
       }
@@ -376,17 +398,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       { state, getters, commit, dispatch },
       { score }: { score: Score }
     ) {
-      if (!isValidTpqn(score.tpqn)) {
-        throw new Error("The tpqn is invalid.");
-      }
-      if (!isValidTempos(score.tempos)) {
-        throw new Error("The tempos are invalid.");
-      }
-      if (!isValidTimeSignatures(score.timeSignatures)) {
-        throw new Error("The time signatures are invalid.");
-      }
-      if (!isValidNotes(score.notes)) {
-        throw new Error("The notes are invalid.");
+      if (!isValidScore(score)) {
+        throw new Error("The score is invalid.");
       }
       if (!transport) {
         throw new Error("transport is undefined.");
@@ -394,6 +407,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (state.nowPlaying) {
         await dispatch("SING_STOP_AUDIO");
       }
+      commit("CLEAR_SELECTED_NOTE_IDS");
       commit("SET_SCORE", { score });
       transport.time = getters.TICK_TO_SECOND(playbackPosition);
 
@@ -403,18 +417,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   SET_TEMPO: {
     mutation(state, { tempo }: { tempo: Tempo }) {
-      const score = getFromOptional(state.score);
-      const index = score.tempos.findIndex((value) => {
+      const index = state.score.tempos.findIndex((value) => {
         return value.position === tempo.position;
       });
-      const tempos = [...score.tempos];
+      const tempos = [...state.score.tempos];
       if (index !== -1) {
         tempos.splice(index, 1, tempo);
       } else {
         tempos.push(tempo);
         tempos.sort((a, b) => a.position - b.position);
       }
-      score.tempos = tempos;
+      state.score.tempos = tempos;
     },
     // テンポを設定する。既に同じ位置にテンポが存在する場合は置き換える。
     async action(
@@ -430,7 +443,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (state.nowPlaying) {
         playbackPosition = getters.SECOND_TO_TICK(transport.time);
       }
-      tempo.tempo = round(tempo.tempo, 2);
+      tempo.bpm = round(tempo.bpm, 2);
       commit("SET_TEMPO", { tempo });
       transport.time = getters.TICK_TO_SECOND(playbackPosition);
 
@@ -440,31 +453,29 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   REMOVE_TEMPO: {
     mutation(state, { position }: { position: number }) {
-      const score = getFromOptional(state.score);
-      const index = score.tempos.findIndex((value) => {
+      const index = state.score.tempos.findIndex((value) => {
         return value.position === position;
       });
       if (index === -1) {
         throw new Error("The tempo does not exist.");
       }
-      const tempos = [...score.tempos];
+      const tempos = [...state.score.tempos];
       if (index === 0) {
         tempos.splice(index, 1, {
           position: 0,
-          tempo: DEFAULT_TEMPO,
+          bpm: DEFAULT_BPM,
         });
       } else {
         tempos.splice(index, 1);
       }
-      score.tempos = tempos;
+      state.score.tempos = tempos;
     },
     // テンポを削除する。先頭のテンポの場合はデフォルトのテンポに置き換える。
     async action(
       { state, getters, commit, dispatch },
       { position }: { position: number }
     ) {
-      const score = getFromOptional(state.score);
-      const exists = score.tempos.some((value) => {
+      const exists = state.score.tempos.some((value) => {
         return value.position === position;
       });
       if (!exists) {
@@ -485,18 +496,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   SET_TIME_SIGNATURE: {
     mutation(state, { timeSignature }: { timeSignature: TimeSignature }) {
-      const score = getFromOptional(state.score);
-      const index = score.timeSignatures.findIndex((value) => {
+      const index = state.score.timeSignatures.findIndex((value) => {
         return value.measureNumber === timeSignature.measureNumber;
       });
-      const timeSignatures = [...score.timeSignatures];
+      const timeSignatures = [...state.score.timeSignatures];
       if (index !== -1) {
         timeSignatures.splice(index, 1, timeSignature);
       } else {
         timeSignatures.push(timeSignature);
         timeSignatures.sort((a, b) => a.measureNumber - b.measureNumber);
       }
-      score.timeSignatures = timeSignatures;
+      state.score.timeSignatures = timeSignatures;
     },
     // 拍子を設定する。既に同じ位置に拍子が存在する場合は置き換える。
     async action(
@@ -512,14 +522,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   REMOVE_TIME_SIGNATURE: {
     mutation(state, { measureNumber }: { measureNumber: number }) {
-      const score = getFromOptional(state.score);
-      const index = score.timeSignatures.findIndex((value) => {
+      const index = state.score.timeSignatures.findIndex((value) => {
         return value.measureNumber === measureNumber;
       });
       if (index === -1) {
         throw new Error("The time signature does not exist.");
       }
-      const timeSignatures = [...score.timeSignatures];
+      const timeSignatures = [...state.score.timeSignatures];
       if (index === 0) {
         timeSignatures.splice(index, 1, {
           measureNumber: 1,
@@ -529,15 +538,14 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       } else {
         timeSignatures.splice(index, 1);
       }
-      score.timeSignatures = timeSignatures;
+      state.score.timeSignatures = timeSignatures;
     },
     // 拍子を削除する。先頭の拍子の場合はデフォルトの拍子に置き換える。
     async action(
       { state, commit },
       { measureNumber }: { measureNumber: number }
     ) {
-      const score = getFromOptional(state.score);
-      const exists = score.timeSignatures.some((value) => {
+      const exists = state.score.timeSignatures.some((value) => {
         return value.measureNumber === measureNumber;
       });
       if (!exists) {
@@ -549,89 +557,77 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   ADD_NOTE: {
     mutation(state, { note }: { note: Note }) {
-      if (state.score) {
-        state.selectedNoteIds.push(note.id);
-        state.score.notes = [...state.score.notes, note].sort(
-          (a, b) => a.position - b.position
-        );
-      }
+      const notes = [...state.score.notes];
+      notes.push(note);
+      notes.sort((a, b) => a.position - b.position);
+      state.score.notes = notes;
+      state.selectedNoteIds.push(note.id);
     },
     // ノートを追加する
     // NOTE: 重複削除など別途追加
-    async action({ state, commit, dispatch }, { note }) {
-      if (state.score === undefined) {
-        throw new Error("Score is not initialized.");
-      }
+    async action({ commit, dispatch }, { note }: { note: Note }) {
       if (!isValidNote(note)) {
         throw new Error("The note is invalid.");
       }
       commit("ADD_NOTE", { note });
+
       dispatch("RENDER");
     },
   },
 
   UPDATE_NOTE: {
-    mutation(state, { note, index }: { note: Note; index: number }) {
-      if (state.score) {
-        const notes = [...state.score.notes];
-        notes.splice(index, 1, note);
-        state.score.notes = notes;
-      }
+    mutation(state, { index, note }: { index: number; note: Note }) {
+      const notes = [...state.score.notes];
+      notes.splice(index, 1, note);
+      state.score.notes = notes;
     },
     async action({ state, commit, dispatch }, { note }) {
-      if (state.score === undefined) {
-        throw new Error("Score is not initialized.");
-      }
       if (!isValidNote(note)) {
         throw new Error("The note is invalid.");
       }
-
       const index = state.score.notes.findIndex((value) => {
         return value.id === note.id;
       });
-
-      if (index !== -1) {
-        commit("UPDATE_NOTE", { note, index });
-        dispatch("RENDER");
-      } else {
+      if (index === -1) {
         throw new Error("The note is not found.");
       }
+      commit("UPDATE_NOTE", { index, note });
+
+      dispatch("RENDER");
     },
   },
 
   REMOVE_NOTE: {
     mutation(state, { id }: { id: string }) {
-      if (state.score) {
-        state.score.notes = [...state.score.notes].filter(
-          (note) => note.id !== id
-        );
-        state.selectedNoteIds = [...state.selectedNoteIds].filter(
-          (selectedId) => selectedId !== id
-        );
-      }
+      const notes = state.score.notes;
+      const selectedNoteIds = state.selectedNoteIds;
+      state.score.notes = notes.filter((value) => {
+        return value.id !== id;
+      });
+      state.selectedNoteIds = selectedNoteIds.filter((value) => {
+        return value !== id;
+      });
     },
-    async action({ state, commit, dispatch }, { id }) {
-      if (state.score === undefined) {
-        throw new Error("Score is not initialized.");
+    async action({ state, commit, dispatch }, { id }: { id: string }) {
+      const exists = state.score.notes.some((value) => {
+        return value.id === id;
+      });
+      if (!exists) {
+        throw new Error("The note is not found.");
       }
-
       commit("REMOVE_NOTE", { id });
+
       dispatch("RENDER");
     },
   },
 
   REPLACE_ALL_NOTES: {
     mutation(state, { notes }: { notes: Note[] }) {
-      if (state.score) {
-        state.score.notes = notes;
-      }
+      state.score.notes = notes;
     },
-    async action({ state, commit, dispatch }, { notes }: { notes: Note[] }) {
-      if (state.score === undefined) {
-        throw new Error("Score is not initialized.");
-      }
-      if (notes.some((note) => !isValidNote(note))) {
-        throw new Error("Invalid notes");
+    async action({ commit, dispatch }, { notes }: { notes: Note[] }) {
+      if (!isValidNotes(notes)) {
+        throw new Error("The notes are invalid.");
       }
       commit("REPLACE_ALL_NOTES", { notes });
 
@@ -644,8 +640,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.selectedNoteIds = noteIds;
     },
     async action({ state, commit }, { noteIds }: { noteIds: string[] }) {
-      if (state.score === undefined) {
-        throw new Error("Score is not initialized.");
+      const notes = state.score.notes;
+      const existingIds = new Set(notes.map((value) => value.id));
+      const exist = noteIds.every((value) => existingIds.has(value));
+      if (!exist) {
+        throw new Error("Contains an ID that does not exist.");
       }
       commit("SET_SELECTED_NOTE_IDS", { noteIds });
     },
@@ -662,15 +661,15 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   REMOVE_SELECTED_NOTES: {
     mutation(state) {
-      if (state.score) {
-        state.score.notes = [...state.score.notes].filter(
-          (note) => !state.selectedNoteIds.includes(note.id)
-        );
-      }
+      const notes = state.score.notes;
+      const selectedNoteIds = state.selectedNoteIds;
+      state.score.notes = notes.filter((note) => {
+        return !selectedNoteIds.includes(note.id);
+      });
+      state.selectedNoteIds = [];
     },
     async action({ commit, dispatch }) {
       commit("REMOVE_SELECTED_NOTES");
-      commit("CLEAR_SELECTED_NOTE_IDS");
 
       dispatch("RENDER");
     },
@@ -681,7 +680,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.sequencerSnapType = snapType;
     },
     async action({ state, commit }, { snapType }) {
-      const tpqn = state.score?.tpqn ?? 480;
+      const tpqn = state.score.tpqn;
       if (!isValidSnapType(snapType, tpqn)) {
         throw new Error("The snap type is invalid.");
       }
@@ -735,15 +734,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   TICK_TO_SECOND: {
     getter: (state) => (position) => {
-      const score = getFromOptional(state.score);
-      return tickToSecond(position, score.tempos, score.tpqn);
+      const tpqn = state.score.tpqn;
+      const tempos = state.score.tempos;
+      return tickToSecond(position, tempos, tpqn);
     },
   },
 
   SECOND_TO_TICK: {
     getter: (state) => (time) => {
-      const score = getFromOptional(state.score);
-      return secondToTick(time, score.tempos, score.tpqn);
+      const tpqn = state.score.tpqn;
+      const tempos = state.score.tempos;
+      return secondToTick(time, tempos, tpqn);
     },
   },
 
@@ -1079,21 +1080,14 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         return blob;
       };
 
-      const getSinger = (): Singer | undefined => {
-        if (state.engineId === undefined || state.styleId === undefined) {
-          return undefined;
-        }
-        return { engineId: state.engineId, styleId: state.styleId };
-      };
-
       // NOTE: 型推論でawaitの前か後かが考慮されないので、関数を介して取得する（型がbooleanになるようにする）
       const startRenderingRequested = () => state.startRenderingRequested;
       const stopRenderingRequested = () => state.stopRenderingRequested;
 
       const render = async () => {
-        if (!state.score || !audioContext || !transport || !channelStrip) {
+        if (!audioContext || !transport || !channelStrip) {
           throw new Error(
-            "score or audioContext or transport or channelStrip is undefined."
+            "audioContext or transport or channelStrip is undefined."
           );
         }
         const audioContextRef = audioContext;
@@ -1102,7 +1096,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         // レンダリング中に変更される可能性のあるデータをコピーする
         const score = copyScore(state.score);
-        const singer = getSinger();
+        const singer = copySinger(state.singer);
 
         preProcess(score);
 
@@ -1403,12 +1397,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         let tempos = midiTempos.map((value): Tempo => {
           return {
             position: convertPosition(value.ticks, midiTpqn, tpqn),
-            tempo: round(value.bpm, 2),
+            bpm: round(value.bpm, 2),
           };
         });
         tempos.unshift({
           position: 0,
-          tempo: DEFAULT_TEMPO,
+          bpm: DEFAULT_BPM,
         });
         tempos = removeDuplicateTempos(tempos);
 
@@ -1476,7 +1470,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         const tempos: Tempo[] = [
           {
             position: 0,
-            tempo: DEFAULT_TEMPO,
+            bpm: DEFAULT_BPM,
           },
         ];
         const timeSignatures: TimeSignature[] = [
@@ -1584,7 +1578,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           const tempo = getAttributeAsNumber(soundElement, "tempo");
           tempos.push({
             position: position,
-            tempo: round(tempo, 2),
+            bpm: round(tempo, 2),
           });
         };
 
diff --git a/src/store/type.ts b/src/store/type.ts
index 1bb245bc5d..898bf66493 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -716,7 +716,7 @@ export type AudioPlayerStoreTypes = {
 
 export type Tempo = {
   position: number;
-  tempo: number;
+  bpm: number;
 };
 
 export type TimeSignature = {
@@ -740,9 +740,13 @@ export type Score = {
   notes: Note[];
 };
 
+export type Singer = {
+  engineId: EngineId;
+  styleId: StyleId;
+};
+
 export type SingingStoreState = {
-  engineId?: EngineId;
-  styleId?: StyleId;
+  singer?: Singer;
   score: Score;
   // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
   isShowSinger: boolean;
@@ -770,8 +774,8 @@ export type SingingStoreTypes = {
   };
 
   SET_SINGER: {
-    mutation: { engineId: EngineId; styleId: StyleId };
-    action(payload: { engineId?: EngineId; styleId?: StyleId }): void;
+    mutation: { singer?: Singer };
+    action(payload: { singer?: Singer }): void;
   };
 
   SET_SCORE: {
@@ -805,7 +809,7 @@ export type SingingStoreTypes = {
   };
 
   UPDATE_NOTE: {
-    mutation: { note: Note; index: number };
+    mutation: { index: number; note: Note };
     action(payload: { note: Note }): void;
   };
 
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index 7449efde16..56c6039ba1 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -21,7 +21,6 @@ import {
   //watch,
 } from "vue";
 import { useStore } from "@/store";
-import { createEmptyScore } from "@/helpers/singHelper";
 // import { QResizeObserver, useQuasar } from "quasar";
 // import path from "path";
 
@@ -31,6 +30,12 @@ import ToolBar from "@/components/Sing/ToolBar.vue";
 import SingerPanel from "@/components/Sing/SingerPanel.vue";
 import ScoreSequencer from "@/components/Sing/ScoreSequencer.vue";
 import ScorePosition from "@/components/Sing/ScorePosition.vue";
+import {
+  DEFAULT_BEATS,
+  DEFAULT_BEAT_TYPE,
+  DEFAULT_BPM,
+  DEFAULT_TPQN,
+} from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingerHome",
@@ -49,7 +54,25 @@ export default defineComponent({
 
     // 歌声合成エディターの初期化
     onMounted(async () => {
-      await store.dispatch("SET_SCORE", { score: createEmptyScore() });
+      await store.dispatch("SET_SCORE", {
+        score: {
+          tpqn: DEFAULT_TPQN,
+          tempos: [
+            {
+              position: 0,
+              bpm: DEFAULT_BPM,
+            },
+          ],
+          timeSignatures: [
+            {
+              measureNumber: 1,
+              beats: DEFAULT_BEATS,
+              beatType: DEFAULT_BEAT_TYPE,
+            },
+          ],
+          notes: [],
+        },
+      });
       await store.dispatch("SET_SINGER", {});
 
       await store.dispatch("SET_VOLUME", { volume: 0.3 });
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index f7a9c0a867..0aa95c47c0 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -15,7 +15,6 @@ import { dictionaryStore } from "@/store/dictionary";
 import { engineStore } from "@/store/engine";
 import { singingStore } from "@/store/singing";
 import { EngineId } from "@/type/preload";
-import { createEmptyScore } from "@/helpers/singHelper";
 const isDevelopment = process.env.NODE_ENV == "development";
 // TODO: Swap external files to Mock
 
@@ -149,7 +148,23 @@ describe("store/vuex.js test", () => {
         progress: -1,
         isVuexReady: false,
         defaultPresetKeys: {},
-        score: createEmptyScore(),
+        score: {
+          tpqn: 480,
+          tempos: [
+            {
+              position: 0,
+              bpm: 120,
+            },
+          ],
+          timeSignatures: [
+            {
+              measureNumber: 1,
+              beats: 4,
+              beatType: 4,
+            },
+          ],
+          notes: [],
+        },
         isShowSinger: true,
         sequencerZoomX: 1,
         sequencerZoomY: 1,

From e3416b076ecaee78a578b630e13144170646792c Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Fri, 3 Nov 2023 17:04:05 +0900
Subject: [PATCH 28/59] =?UTF-8?q?[project-s]=20=E3=82=B7=E3=83=BC=E3=82=B1?=
 =?UTF-8?q?=E3=83=B3=E3=82=B5=E3=83=BC=E5=91=A8=E3=82=8A=E3=81=AE=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4=20(#1632)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScorePosition.vue  |   5 +-
 src/components/Sing/ScoreSequencer.vue |  89 ++++++++-------
 src/components/Sing/SequencerKeys.vue  | 149 ++++++++++++++++---------
 src/components/Sing/SequencerNote.vue  |   6 +-
 src/components/Sing/SingerPanel.vue    |   1 -
 src/views/SingerHome.vue               |  14 +--
 6 files changed, 156 insertions(+), 108 deletions(-)

diff --git a/src/components/Sing/ScorePosition.vue b/src/components/Sing/ScorePosition.vue
index 3d3acb9bb9..ae0e448b37 100644
--- a/src/components/Sing/ScorePosition.vue
+++ b/src/components/Sing/ScorePosition.vue
@@ -7,7 +7,9 @@ import { defineComponent } from "vue";
 
 export default defineComponent({
   name: "SingScorePosition",
-
+  props: {
+    offset: { type: Number, default: 0 },
+  },
   setup() {
     return {};
   },
@@ -22,6 +24,5 @@ export default defineComponent({
   background: colors.$background;
   border-bottom: 1px solid #ccc;
   height: 32px;
-  width: 100%;
 }
 </style>
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 2d965d219a..fb42b30668 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -1,21 +1,24 @@
 <template>
   <div
-    id="score-sequencer"
     class="score-sequencer"
     @mousedown="handleMouseDown"
     @mousemove="handleMouseMove"
     @mouseup="handleMouseUp"
     @dblclick="addNote"
   >
+    <!-- 左上の角 -->
+    <div class="corner"></div>
+    <!-- スコア位置を表示するエリア -->
+    <score-position :offset="scrollX" />
     <!-- 鍵盤 -->
-    <sequencer-keys />
+    <sequencer-keys :offset="scrollY" />
     <!-- シーケンサ -->
-    <div class="sequencer-body">
+    <div id="sequencer-body" class="sequencer-body" @scroll="onScroll">
       <!-- グリッド -->
       <!-- NOTE: 現状小節+オクターブごとの罫線なし -->
       <svg
-        :width="`${gridCellWidth * numOfGridColumns}`"
-        :height="`${gridCellHeight * keyInfos.length}`"
+        :width="gridCellWidth * numOfGridColumns"
+        :height="gridCellHeight * keyInfos.length"
         xmlns="http://www.w3.org/2000/svg"
         class="sequencer-grid"
       >
@@ -24,42 +27,42 @@
           <pattern
             id="sequencer-grid-octave-cells"
             patternUnits="userSpaceOnUse"
-            :width="`${gridCellWidth}`"
-            :height="`${gridCellHeight * 12}`"
+            :width="gridCellWidth"
+            :height="gridCellHeight * 12"
           >
             <rect
               v-for="(keyInfo, index) in keyInfos"
               :key="index"
               x="0"
-              :y="`${gridCellHeight * index}`"
-              :width="`${gridCellWidth}`"
-              :height="`${gridCellHeight}`"
+              :y="gridCellHeight * index"
+              :width="gridCellWidth"
+              :height="gridCellHeight"
               :class="`sequencer-grid-cell sequencer-grid-cell-${keyInfo.color}`"
             />
           </pattern>
           <pattern
             id="sequencer-grid-measure"
             patternUnits="userSpaceOnUse"
-            :width="`${beatWidth * beatsPerMeasure}`"
-            :height="`${gridCellHeight * keyInfos.length}`"
+            :width="beatWidth * beatsPerMeasure"
+            :height="gridCellHeight * keyInfos.length"
           >
             <line
               v-for="n in beatsPerMeasure"
               :key="n"
-              :x1="`${beatWidth * (n - 1)}`"
-              :x2="`${beatWidth * (n - 1)}`"
+              :x1="beatWidth * (n - 1)"
+              :x2="beatWidth * (n - 1)"
               y1="0"
               y2="100%"
               stroke-width="1"
               :class="`sequencer-grid-${n === 1 ? 'measure' : 'beat'}-line`"
             />
             <line
-              :x1="`${beatWidth * beatsPerMeasure}`"
-              :x2="`${beatWidth * beatsPerMeasure}`"
+              :x1="beatWidth * beatsPerMeasure"
+              :x2="beatWidth * beatsPerMeasure"
               y1="0"
               y2="100%"
               stroke-width="1"
-              :class="`sequencer-grid-measure-line`"
+              class="sequencer-grid-measure-line"
             />
           </pattern>
         </defs>
@@ -101,8 +104,8 @@
       :style="{
         position: 'fixed',
         zIndex: 10000,
-        bottom: '8px',
-        right: '16px',
+        bottom: '20px',
+        right: '36px',
         width: '80px',
       }"
       @input="setZoomX"
@@ -116,8 +119,8 @@
       :style="{
         position: 'fixed',
         zIndex: 10000,
-        bottom: '64px',
-        right: '-8px',
+        bottom: '68px',
+        right: '-12px',
         transform: 'rotate(-90deg)',
         width: '80px',
       }"
@@ -130,6 +133,7 @@
 import { defineComponent, computed, ref, onMounted } from "vue";
 import { v4 as uuidv4 } from "uuid";
 import { useStore } from "@/store";
+import ScorePosition from "@/components/Sing/ScorePosition.vue";
 import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
 import SequencerNote from "@/components/Sing/SequencerNote.vue";
 import {
@@ -148,6 +152,7 @@ import {
 export default defineComponent({
   name: "SingScoreSequencer",
   components: {
+    ScorePosition,
     SequencerKeys,
     SequencerNote,
   },
@@ -233,8 +238,8 @@ export default defineComponent({
       return tickToBaseX(beatTicks, tpqn.value) * zoomX.value;
     });
     // スクロール位置
-    // const scrollX = computed(() => state.sequencerScrollX);
-    // const scrollY = computed(() => state.sequencerScrollY);
+    const scrollX = ref(0);
+    const scrollY = ref(0);
     const selectedNoteIds = computed(() => state.selectedNoteIds);
 
     // ノートの追加
@@ -585,14 +590,21 @@ export default defineComponent({
       }
     };
 
+    const onScroll = (event: Event) => {
+      if (event.target instanceof HTMLElement) {
+        scrollX.value = event.target.scrollLeft;
+        scrollY.value = event.target.scrollTop;
+      }
+    };
+
     onMounted(() => {
-      const el = document.querySelector("#score-sequencer");
+      const el = document.querySelector("#sequencer-body");
       // 上から2/3の位置がC4になるようにスクロールする
       if (el) {
         const c4BaseY = noteNumberToBaseY(60);
         const clientBaseHeight = el.clientHeight / zoomY.value;
         const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
-        el.scrollTop = scrollBaseY * zoomY.value;
+        el.scrollTo(0, scrollBaseY * zoomY.value);
       }
     });
 
@@ -608,6 +620,8 @@ export default defineComponent({
       zoomY,
       cursorX,
       cursorY,
+      scrollX,
+      scrollY,
       setZoomX,
       setZoomY,
       addNote,
@@ -618,6 +632,7 @@ export default defineComponent({
       handleDragMoveStart,
       handleDragRightStart,
       handleDragLeftStart,
+      onScroll,
     };
   },
 });
@@ -629,27 +644,25 @@ export default defineComponent({
 
 .score-sequencer {
   backface-visibility: hidden;
-  display: block;
-  height: 100%;
-  overflow: auto;
-  padding-bottom: 164px;
-  position: relative;
-  width: 100%;
+  display: grid;
+  grid-template-rows: 32px 1fr;
+  grid-template-columns: 48px 1fr;
 
   &.move {
     cursor: move;
   }
 }
 
+.corner {
+  background: #fff;
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+
 .sequencer-body {
   backface-visibility: hidden;
-  display: block;
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  top: 0;
-  left: 48px;
-  padding-bottom: 164px;
+  overflow: auto;
+  position: relative;
 }
 
 .sequencer-grid {
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index 7cc6bb60f2..ebe0147e86 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -1,40 +1,51 @@
 <template>
-  <svg
-    width="48"
-    :height="`${keyHeight * keyInfos.length}`"
-    xmlns="http://www.w3.org/2000/svg"
-    class="sequencer-keys"
-  >
-    <g v-for="(keyInfo, index) in keyInfos" :key="index">
-      <rect
-        x="0"
-        :y="`${keyHeight * index}`"
-        :width="`${keyInfo.color === 'black' ? 30 : 48}`"
-        :height="`${keyHeight}`"
-        :class="`sequencer-keys-item-${keyInfo.color}`"
-        :title="keyInfo.name"
-      />
-      <line
-        v-if="keyInfo.pitch === 'C' || keyInfo.pitch === 'F'"
-        x1="0"
-        x2="48"
-        :y1="`${(index + 1) * keyHeight}`"
-        :y2="`${(index + 1) * keyHeight}`"
-        :class="`sequencer-keys-item-separator ${
-          keyInfo.pitch === 'C' && 'sequencer-keys-item-separator-octave'
-        } ${keyInfo.pitch === 'F' && 'sequencer-keys-item-separator-f'}`"
-      />
-      <text
-        v-if="keyInfo.pitch === 'C'"
-        font-size="10"
-        x="32"
-        :y="`${keyHeight * (index + 1) - 4}`"
-        class="sequencer-keys-item-pitchname"
-      >
-        {{ keyInfo.name }}
-      </text>
-    </g>
-  </svg>
+  <div class="sequencer-keys">
+    <svg
+      width="48"
+      :height="keyHeight * keyInfos.length + 1"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <defs>
+        <symbol id="white-keys">
+          <g v-for="(whiteKeyInfo, index) in whiteKeyInfos" :key="index">
+            <rect
+              :x="whiteKeyRects[index].x"
+              :y="whiteKeyRects[index].y"
+              :width="whiteKeyRects[index].width"
+              :height="whiteKeyRects[index].height"
+              class="sequencer-keys-item-white"
+              :title="whiteKeyInfo.name"
+            />
+            <text
+              v-if="whiteKeyInfo.pitch === 'C'"
+              font-size="10"
+              x="32"
+              :y="keyHeight * (128 - whiteKeyInfo.noteNumber) - 4"
+              class="sequencer-keys-item-pitchname"
+            >
+              {{ whiteKeyInfo.name }}
+            </text>
+          </g>
+        </symbol>
+        <symbol id="black-keys">
+          <rect
+            v-for="(blackKeyInfo, index) in blackKeyInfos"
+            :key="index"
+            :x="blackKeyRects[index].x"
+            :y="blackKeyRects[index].y"
+            :width="blackKeyRects[index].width"
+            :height="blackKeyRects[index].height"
+            rx="2"
+            ry="2"
+            class="sequencer-keys-item-black"
+            :title="blackKeyInfo.name"
+          />
+        </symbol>
+      </defs>
+      <use href="#white-keys" :y="-offset" />
+      <use href="#black-keys" :y="-offset" />
+    </svg>
+  </div>
 </template>
 
 <script lang="ts">
@@ -44,17 +55,64 @@ import { keyInfos, getKeyBaseHeight } from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingSequencerKeys",
+  props: {
+    offset: { type: Number, default: 0 },
+  },
   setup() {
     const store = useStore();
     const zoomX = computed(() => store.state.sequencerZoomX);
     const zoomY = computed(() => store.state.sequencerZoomY);
     const keyBaseHeight = getKeyBaseHeight();
+    const whiteKeyInfos = keyInfos.filter((value) => value.color === "white");
+    const blackKeyInfos = keyInfos.filter((value) => value.color === "black");
+    const whiteKeyBasePositions = whiteKeyInfos.map((value) => {
+      const noteNumber = value.noteNumber;
+      const n = noteNumber % 12;
+      const o = Math.floor(noteNumber / 12);
+      if (n < 5) {
+        return keyBaseHeight * (128 - 12 * o - (5 / 3) * (n / 2 + 1));
+      } else {
+        return keyBaseHeight * (128 - 12 * o - 5 - (7 / 4) * ((n - 5) / 2 + 1));
+      }
+    });
+    const blackKeyBasePositions = blackKeyInfos.map((value) => {
+      return keyBaseHeight * (127 - value.noteNumber);
+    });
     const keyHeight = computed(() => keyBaseHeight * zoomY.value);
+    const whiteKeyRects = computed(() => {
+      return whiteKeyBasePositions.map((value, index, array) => {
+        const isLast = index === array.length - 1;
+        const nextValue = isLast ? keyBaseHeight * 128 : array[index + 1];
+        return {
+          x: -2.5,
+          y: Math.floor(value * zoomY.value) + 0.5,
+          width: 50,
+          height:
+            Math.floor(nextValue * zoomY.value) -
+            Math.floor(value * zoomY.value),
+        };
+      });
+    });
+    const blackKeyRects = computed(() => {
+      return blackKeyBasePositions.map((value) => {
+        return {
+          x: -2.5,
+          y: Math.floor(value * zoomY.value) + 0.5,
+          width: 32,
+          height: Math.floor(keyBaseHeight * zoomY.value),
+        };
+      });
+    });
+
     return {
       keyInfos,
       zoomX,
       zoomY,
       keyHeight,
+      whiteKeyInfos,
+      blackKeyInfos,
+      whiteKeyRects,
+      blackKeyRects,
     };
   },
 });
@@ -67,29 +125,16 @@ export default defineComponent({
 .sequencer-keys {
   backface-visibility: hidden;
   background: #fff;
-  display: block;
-  position: sticky;
-  left: 0;
-  z-index: 100;
-}
-
-.sequencer-keys-item-separator {
-  stroke-width: 1;
-}
-.sequencer-keys-item-separator-octave {
-  stroke: #bbb;
-}
-
-.sequencer-keys-item-separator-f {
-  stroke: #ddd;
+  overflow: hidden;
 }
 
 .sequencer-keys-item-white {
   fill: #fff;
+  stroke: #ccc;
 }
 
 .sequencer-keys-item-black {
-  fill: #555;
+  fill: #5a5a5a;
 }
 
 .sequencer-keys-item-pitchname {
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index e2310f434f..4518ebca62 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -13,8 +13,8 @@
       @input="setLyric"
     />
     <svg
-      :height="`${barHeight}`"
-      :width="`${barWidth}`"
+      :height="barHeight"
+      :width="barWidth"
       xmlns="http://www.w3.org/2000/svg"
       class="sequencer-note-bar"
       focusable="true"
@@ -43,7 +43,7 @@
         />
         <rect
           y="-25%"
-          :x="`${barWidth - 4}`"
+          :x="barWidth - 4"
           width="12"
           height="150%"
           fill-opacity="0"
diff --git a/src/components/Sing/SingerPanel.vue b/src/components/Sing/SingerPanel.vue
index 329f493b11..0065c746c9 100644
--- a/src/components/Sing/SingerPanel.vue
+++ b/src/components/Sing/SingerPanel.vue
@@ -84,7 +84,6 @@ export default defineComponent({
 .sing-singer-panel {
   background: colors.$background;
   border-right: 1px solid #ccc;
-  height: 100%;
   width: 200px;
 
   &.hide {
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index 56c6039ba1..d394a837ba 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -4,10 +4,7 @@
   <tool-bar />
   <div class="sing-main">
     <singer-panel />
-    <div class="sing-editor">
-      <score-position />
-      <score-sequencer />
-    </div>
+    <score-sequencer />
   </div>
 </template>
 
@@ -29,7 +26,6 @@ import MenuBar from "@/components/Sing/MenuBar.vue";
 import ToolBar from "@/components/Sing/ToolBar.vue";
 import SingerPanel from "@/components/Sing/SingerPanel.vue";
 import ScoreSequencer from "@/components/Sing/ScoreSequencer.vue";
-import ScorePosition from "@/components/Sing/ScorePosition.vue";
 import {
   DEFAULT_BEATS,
   DEFAULT_BEAT_TYPE,
@@ -45,7 +41,6 @@ export default defineComponent({
     ToolBar,
     SingerPanel,
     ScoreSequencer,
-    ScorePosition,
   },
 
   setup() {
@@ -99,11 +94,6 @@ export default defineComponent({
 }
 .sing-main {
   display: flex;
-  height: 100vh;
-  width: 100vw;
-}
-
-.sing-editor {
-  width: 100%;
+  overflow: hidden;
 }
 </style>

From 37eb121614c73109d5439dc34a90833787968fe1 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 5 Nov 2023 18:56:06 +0900
Subject: [PATCH 29/59] =?UTF-8?q?[project-s]=20=E3=83=AB=E3=83=BC=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E5=AE=9F=E8=A3=85=20(#1639)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScorePosition.vue  |  28 -----
 src/components/Sing/ScoreSequencer.vue |  67 +++++++----
 src/components/Sing/SequencerKeys.vue  |  42 +++----
 src/components/Sing/SequencerRuler.vue | 155 +++++++++++++++++++++++++
 4 files changed, 220 insertions(+), 72 deletions(-)
 delete mode 100644 src/components/Sing/ScorePosition.vue
 create mode 100644 src/components/Sing/SequencerRuler.vue

diff --git a/src/components/Sing/ScorePosition.vue b/src/components/Sing/ScorePosition.vue
deleted file mode 100644
index ae0e448b37..0000000000
--- a/src/components/Sing/ScorePosition.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-  <div class="sing-score-position">シーケンサ上ツールバー</div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from "vue";
-
-export default defineComponent({
-  name: "SingScorePosition",
-  props: {
-    offset: { type: Number, default: 0 },
-  },
-  setup() {
-    return {};
-  },
-});
-</script>
-
-<style scoped lang="scss">
-@use '@/styles/variables' as vars;
-@use '@/styles/colors' as colors;
-
-.sing-score-position {
-  background: colors.$background;
-  border-bottom: 1px solid #ccc;
-  height: 32px;
-}
-</style>
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index fb42b30668..b51e2d802c 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -1,19 +1,36 @@
 <template>
   <div
     class="score-sequencer"
-    @mousedown="handleMouseDown"
-    @mousemove="handleMouseMove"
-    @mouseup="handleMouseUp"
-    @dblclick="addNote"
+    :style="{
+      display: 'grid',
+      gridTemplateRows: `${rulerHeight}px 1fr`,
+      gridTemplateColumns: `${keysWidth}px 1fr`,
+    }"
   >
     <!-- 左上の角 -->
     <div class="corner"></div>
-    <!-- スコア位置を表示するエリア -->
-    <score-position :offset="scrollX" />
+    <!-- ルーラー -->
+    <sequencer-ruler
+      :offset="scrollX"
+      :height="rulerHeight"
+      :num-of-measures="numOfMeasures"
+    />
     <!-- 鍵盤 -->
-    <sequencer-keys :offset="scrollY" />
+    <sequencer-keys
+      :offset="scrollY"
+      :width="keysWidth"
+      :black-key-width="30"
+    />
     <!-- シーケンサ -->
-    <div id="sequencer-body" class="sequencer-body" @scroll="onScroll">
+    <div
+      id="sequencer-body"
+      class="sequencer-body"
+      @mousedown="handleMouseDown"
+      @mousemove="handleMouseMove"
+      @mouseup="handleMouseUp"
+      @dblclick="addNote"
+      @scroll="onScroll"
+    >
       <!-- グリッド -->
       <!-- NOTE: 現状小節+オクターブごとの罫線なし -->
       <svg
@@ -133,7 +150,7 @@
 import { defineComponent, computed, ref, onMounted } from "vue";
 import { v4 as uuidv4 } from "uuid";
 import { useStore } from "@/store";
-import ScorePosition from "@/components/Sing/ScorePosition.vue";
+import SequencerRuler from "@/components/Sing/SequencerRuler.vue";
 import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
 import SequencerNote from "@/components/Sing/SequencerNote.vue";
 import {
@@ -152,10 +169,14 @@ import {
 export default defineComponent({
   name: "SingScoreSequencer",
   components: {
-    ScorePosition,
+    SequencerRuler,
     SequencerKeys,
     SequencerNote,
   },
+  props: {
+    rulerHeight: { type: Number, default: 32 },
+    keysWidth: { type: Number, default: 48 },
+  },
   setup() {
     enum DragMode {
       NONE = "NONE",
@@ -206,18 +227,11 @@ export default defineComponent({
     const gridCellHeight = computed(() => {
       return gridCellBaseHeight * zoomY.value;
     });
-    const numOfGridColumns = computed(() => {
-      // TODO: 複数拍子に対応する
-      const beats = timeSignatures.value[0].beats;
-      const beatType = timeSignatures.value[0].beatType;
-      const measureDuration = getMeasureDuration(beats, beatType, tpqn.value);
-      const numOfGridColumnsPerMeasure = Math.round(
-        measureDuration / gridCellTicks.value
-      );
+    const numOfMeasures = computed(() => {
       // NOTE: 最低長: 仮32小節...スコア長(曲長さ)が決まっていないため、無限スクロール化する or 最後尾に足した場合は伸びるようにするなど？
       const minNumOfMeasures = 32;
       // NOTE: いったん最後尾に足した場合は伸びるようにする
-      const numOfMeasures = Math.max(
+      return Math.max(
         minNumOfMeasures,
         getNumOfMeasures(
           notes.value,
@@ -226,7 +240,16 @@ export default defineComponent({
           tpqn.value
         ) + 1
       );
-      return numOfGridColumnsPerMeasure * numOfMeasures;
+    });
+    const numOfGridColumns = computed(() => {
+      // TODO: 複数拍子に対応する
+      const beats = timeSignatures.value[0].beats;
+      const beatType = timeSignatures.value[0].beatType;
+      const measureDuration = getMeasureDuration(beats, beatType, tpqn.value);
+      const numOfGridColumnsPerMeasure = Math.round(
+        measureDuration / gridCellTicks.value
+      );
+      return numOfGridColumnsPerMeasure * numOfMeasures.value;
     });
     const beatsPerMeasure = computed(() => {
       return timeSignatures.value[0].beats;
@@ -613,6 +636,7 @@ export default defineComponent({
       beatWidth,
       gridCellWidth,
       gridCellHeight,
+      numOfMeasures,
       numOfGridColumns,
       keyInfos,
       notes,
@@ -644,9 +668,6 @@ export default defineComponent({
 
 .score-sequencer {
   backface-visibility: hidden;
-  display: grid;
-  grid-template-rows: 32px 1fr;
-  grid-template-columns: 48px 1fr;
 
   &.move {
     cursor: move;
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index ebe0147e86..d48c10d2b2 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -1,16 +1,12 @@
 <template>
   <div class="sequencer-keys">
-    <svg
-      width="48"
-      :height="keyHeight * keyInfos.length + 1"
-      xmlns="http://www.w3.org/2000/svg"
-    >
+    <svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height">
       <defs>
         <symbol id="white-keys">
           <g v-for="(whiteKeyInfo, index) in whiteKeyInfos" :key="index">
             <rect
-              :x="whiteKeyRects[index].x"
-              :y="whiteKeyRects[index].y"
+              :x="whiteKeyRects[index].x - 0.5"
+              :y="whiteKeyRects[index].y + 0.5"
               :width="whiteKeyRects[index].width"
               :height="whiteKeyRects[index].height"
               class="sequencer-keys-item-white"
@@ -19,8 +15,8 @@
             <text
               v-if="whiteKeyInfo.pitch === 'C'"
               font-size="10"
-              x="32"
-              :y="keyHeight * (128 - whiteKeyInfo.noteNumber) - 4"
+              :x="blackKeyWidth + 2"
+              :y="whiteKeyRects[index].y + whiteKeyRects[index].height - 4"
               class="sequencer-keys-item-pitchname"
             >
               {{ whiteKeyInfo.name }}
@@ -31,8 +27,8 @@
           <rect
             v-for="(blackKeyInfo, index) in blackKeyInfos"
             :key="index"
-            :x="blackKeyRects[index].x"
-            :y="blackKeyRects[index].y"
+            :x="blackKeyRects[index].x - 0.5"
+            :y="blackKeyRects[index].y + 0.5"
             :width="blackKeyRects[index].width"
             :height="blackKeyRects[index].height"
             rx="2"
@@ -57,8 +53,10 @@ export default defineComponent({
   name: "SingSequencerKeys",
   props: {
     offset: { type: Number, default: 0 },
+    width: { type: Number, default: 48 },
+    blackKeyWidth: { type: Number, default: 30 },
   },
-  setup() {
+  setup(props) {
     const store = useStore();
     const zoomX = computed(() => store.state.sequencerZoomX);
     const zoomY = computed(() => store.state.sequencerZoomY);
@@ -78,15 +76,17 @@ export default defineComponent({
     const blackKeyBasePositions = blackKeyInfos.map((value) => {
       return keyBaseHeight * (127 - value.noteNumber);
     });
-    const keyHeight = computed(() => keyBaseHeight * zoomY.value);
+    const height = computed(() => {
+      return keyBaseHeight * 128 * zoomY.value + 1;
+    });
     const whiteKeyRects = computed(() => {
       return whiteKeyBasePositions.map((value, index, array) => {
         const isLast = index === array.length - 1;
         const nextValue = isLast ? keyBaseHeight * 128 : array[index + 1];
         return {
-          x: -2.5,
-          y: Math.floor(value * zoomY.value) + 0.5,
-          width: 50,
+          x: -2,
+          y: Math.floor(value * zoomY.value),
+          width: props.width + 2,
           height:
             Math.floor(nextValue * zoomY.value) -
             Math.floor(value * zoomY.value),
@@ -96,9 +96,9 @@ export default defineComponent({
     const blackKeyRects = computed(() => {
       return blackKeyBasePositions.map((value) => {
         return {
-          x: -2.5,
-          y: Math.floor(value * zoomY.value) + 0.5,
-          width: 32,
+          x: -2,
+          y: Math.floor(value * zoomY.value),
+          width: props.blackKeyWidth + 2,
           height: Math.floor(keyBaseHeight * zoomY.value),
         };
       });
@@ -108,7 +108,7 @@ export default defineComponent({
       keyInfos,
       zoomX,
       zoomY,
-      keyHeight,
+      height,
       whiteKeyInfos,
       blackKeyInfos,
       whiteKeyRects,
@@ -124,7 +124,7 @@ export default defineComponent({
 
 .sequencer-keys {
   backface-visibility: hidden;
-  background: #fff;
+  background: #ccc;
   overflow: hidden;
 }
 
diff --git a/src/components/Sing/SequencerRuler.vue b/src/components/Sing/SequencerRuler.vue
new file mode 100644
index 0000000000..6e81dd2bd2
--- /dev/null
+++ b/src/components/Sing/SequencerRuler.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="sequencer-ruler">
+    <svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height">
+      <defs>
+        <pattern
+          id="sequencer-ruler-measure"
+          patternUnits="userSpaceOnUse"
+          :x="-offset"
+          :width="measureWidth"
+          :height="height"
+        >
+          <line
+            x1="0"
+            x2="0"
+            y1="0"
+            :y2="height"
+            stroke-width="1"
+            class="sequencer-ruler-measure-line"
+          />
+          <line
+            :x1="measureWidth"
+            :x2="measureWidth"
+            y1="0"
+            :y2="height"
+            stroke-width="1"
+            class="sequencer-ruler-measure-line"
+          />
+        </pattern>
+        <symbol id="sequencer-ruler-measure-numbers">
+          <text
+            v-for="measureInfo in measureInfos"
+            :key="measureInfo.number"
+            font-size="14"
+            :x="measureInfo.x + 6"
+            y="18"
+            class="sequencer-ruler-measure-number"
+          >
+            {{ measureInfo.number }}
+          </text>
+        </symbol>
+      </defs>
+      <rect
+        :width="width"
+        :height="height"
+        fill="url(#sequencer-ruler-measure)"
+      />
+      <use href="#sequencer-ruler-measure-numbers" :x="-offset" />
+    </svg>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from "vue";
+import { useStore } from "@/store";
+import {
+  getMeasureDuration,
+  getTimeSignaturePositions,
+  tickToBaseX,
+} from "@/helpers/singHelper";
+
+export default defineComponent({
+  name: "SingSequencerRuler",
+  props: {
+    offset: { type: Number, default: 0 },
+    height: { type: Number, default: 32 },
+    numOfMeasures: { type: Number, default: 32 },
+  },
+  setup(props) {
+    const store = useStore();
+    const state = store.state;
+    const tpqn = computed(() => state.score.tpqn);
+    const timeSignatures = computed(() => state.score.timeSignatures);
+    const zoomX = computed(() => state.sequencerZoomX);
+    const measureWidth = computed(() => {
+      const measureDuration = getMeasureDuration(
+        timeSignatures.value[0].beats,
+        timeSignatures.value[0].beatType,
+        tpqn.value
+      );
+      return tickToBaseX(measureDuration, tpqn.value) * zoomX.value;
+    });
+    const tsPositions = computed(() => {
+      return getTimeSignaturePositions(timeSignatures.value, tpqn.value);
+    });
+    const endTicks = computed(() => {
+      const lastTs = timeSignatures.value[timeSignatures.value.length - 1];
+      const lastTsPosition = tsPositions.value[tsPositions.value.length - 1];
+      return (
+        lastTsPosition +
+        getMeasureDuration(lastTs.beats, lastTs.beatType, tpqn.value) *
+          (props.numOfMeasures - lastTs.measureNumber + 1)
+      );
+    });
+    const width = computed(() => {
+      return tickToBaseX(endTicks.value, tpqn.value) * zoomX.value;
+    });
+    const measureInfos = computed(() => {
+      const measureInfos: {
+        number: number;
+        x: number;
+      }[] = [];
+      for (let i = 0; i < timeSignatures.value.length; i++) {
+        const ts = timeSignatures.value[i];
+        const measureDuration = getMeasureDuration(
+          ts.beats,
+          ts.beatType,
+          tpqn.value
+        );
+        const nextTsPosition =
+          i !== timeSignatures.value.length - 1
+            ? tsPositions.value[i + 1]
+            : undefined;
+        let measureNumber = ts.measureNumber;
+        let measurePosition = tsPositions.value[i];
+        while (measurePosition < (nextTsPosition ?? endTicks.value)) {
+          const baseX = tickToBaseX(measurePosition, tpqn.value);
+          measureInfos.push({
+            number: measureNumber,
+            x: Math.floor(baseX * zoomX.value),
+          });
+          measureNumber++;
+          measurePosition += measureDuration;
+        }
+      }
+      return measureInfos;
+    });
+
+    return {
+      measureWidth,
+      width,
+      measureInfos,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.sequencer-ruler {
+  background: colors.$background;
+  border-bottom: 1px solid #ccc;
+  overflow: hidden;
+}
+
+.sequencer-ruler-measure-number {
+  fill: #555;
+}
+
+.sequencer-ruler-measure-line {
+  backface-visibility: hidden;
+  stroke: #b0b0b0;
+}
+</style>

From cb468f06f7b78f650ca24784976087c74cd062cc Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 6 Nov 2023 22:15:37 +0900
Subject: [PATCH 30/59] =?UTF-8?q?[project-s]=20=E3=82=BA=E3=83=BC=E3=83=A0?=
 =?UTF-8?q?=E5=91=A8=E3=82=8A=E3=81=AE=E8=AA=BF=E6=95=B4=20(#1640)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue | 144 ++++++++++++++++---------
 src/components/Sing/SequencerKeys.vue  |  41 ++++++-
 src/components/Sing/SequencerRuler.vue |  36 ++++++-
 3 files changed, 163 insertions(+), 58 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index b51e2d802c..37af5b310a 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -1,34 +1,20 @@
 <template>
-  <div
-    class="score-sequencer"
-    :style="{
-      display: 'grid',
-      gridTemplateRows: `${rulerHeight}px 1fr`,
-      gridTemplateColumns: `${keysWidth}px 1fr`,
-    }"
-  >
+  <div class="score-sequencer">
     <!-- 左上の角 -->
     <div class="corner"></div>
     <!-- ルーラー -->
-    <sequencer-ruler
-      :offset="scrollX"
-      :height="rulerHeight"
-      :num-of-measures="numOfMeasures"
-    />
+    <sequencer-ruler :offset="scrollX" :num-of-measures="numOfMeasures" />
     <!-- 鍵盤 -->
-    <sequencer-keys
-      :offset="scrollY"
-      :width="keysWidth"
-      :black-key-width="30"
-    />
+    <sequencer-keys :offset="scrollY" :black-key-width="30" />
     <!-- シーケンサ -->
     <div
-      id="sequencer-body"
+      ref="sequencerBody"
       class="sequencer-body"
       @mousedown="handleMouseDown"
       @mousemove="handleMouseMove"
       @mouseup="handleMouseUp"
       @dblclick="addNote"
+      @wheel="onWheel"
       @scroll="onScroll"
     >
       <!-- グリッド -->
@@ -114,9 +100,9 @@
     <!-- NOTE: スクロールバー+ズームレンジ仮 -->
     <input
       type="range"
-      min="0.2"
-      max="1"
-      step="0.05"
+      :min="ZOOM_X_MIN"
+      :max="ZOOM_X_MAX"
+      :step="ZOOM_X_STEP"
       :value="zoomX"
       :style="{
         position: 'fixed',
@@ -129,9 +115,9 @@
     />
     <input
       type="range"
-      min="0.25"
-      max="1"
-      step="0.05"
+      :min="ZOOM_Y_MIN"
+      :max="ZOOM_Y_MAX"
+      :step="ZOOM_Y_STEP"
       :value="zoomY"
       :style="{
         position: 'fixed',
@@ -173,11 +159,14 @@ export default defineComponent({
     SequencerKeys,
     SequencerNote,
   },
-  props: {
-    rulerHeight: { type: Number, default: 32 },
-    keysWidth: { type: Number, default: 48 },
-  },
   setup() {
+    const ZOOM_X_MIN = 0.2;
+    const ZOOM_X_MAX = 1;
+    const ZOOM_X_STEP = 0.05;
+    const ZOOM_Y_MIN = 0.35;
+    const ZOOM_Y_MAX = 1;
+    const ZOOM_Y_STEP = 0.05;
+
     enum DragMode {
       NONE = "NONE",
       MOVE = "MOVE",
@@ -265,6 +254,8 @@ export default defineComponent({
     const scrollY = ref(0);
     const selectedNoteIds = computed(() => state.selectedNoteIds);
 
+    const sequencerBody = ref<HTMLElement | null>(null);
+
     // ノートの追加
     const addNote = (event: MouseEvent) => {
       const eventOffsetBaseX = event.offsetX / zoomX.value;
@@ -496,22 +487,40 @@ export default defineComponent({
 
     // X軸ズーム
     const setZoomX = (event: Event) => {
-      if (!(event.target instanceof HTMLInputElement)) {
-        return;
+      const sequencerBodyElement = sequencerBody.value;
+      if (event.target instanceof HTMLInputElement && sequencerBodyElement) {
+        // 画面の中央を基準に水平方向のズームを行う
+        const oldZoomX = zoomX.value;
+        const newZoomX = Number(event.target.value);
+        const scrollLeft = sequencerBodyElement.scrollLeft;
+        const scrollTop = sequencerBodyElement.scrollTop;
+        const clientWidth = sequencerBodyElement.clientWidth;
+
+        store.dispatch("SET_ZOOM_X", { zoomX: newZoomX }).then(() => {
+          const centerBaseX = (scrollLeft + clientWidth / 2) / oldZoomX;
+          const newScrollLeft = centerBaseX * newZoomX - clientWidth / 2;
+          sequencerBodyElement.scrollTo(newScrollLeft, scrollTop);
+        });
       }
-      store.dispatch("SET_ZOOM_X", {
-        zoomX: Number(event.target.value),
-      });
     };
 
     // Y軸ズーム
     const setZoomY = (event: Event) => {
-      if (!(event.target instanceof HTMLInputElement)) {
-        return;
+      const sequencerBodyElement = sequencerBody.value;
+      if (event.target instanceof HTMLInputElement && sequencerBodyElement) {
+        // 画面の中央を基準に垂直方向のズームを行う
+        const oldZoomY = zoomY.value;
+        const newZoomY = Number(event.target.value);
+        const scrollLeft = sequencerBodyElement.scrollLeft;
+        const scrollTop = sequencerBodyElement.scrollTop;
+        const clientHeight = sequencerBodyElement.clientHeight;
+
+        store.dispatch("SET_ZOOM_Y", { zoomY: newZoomY }).then(() => {
+          const centerBaseY = (scrollTop + clientHeight / 2) / oldZoomY;
+          const newScrollTop = centerBaseY * newZoomY - clientHeight / 2;
+          sequencerBodyElement.scrollTo(scrollLeft, newScrollTop);
+        });
       }
-      store.dispatch("SET_ZOOM_Y", {
-        zoomY: Number(event.target.value),
-      });
     };
 
     // キーボードイベント
@@ -613,6 +622,28 @@ export default defineComponent({
       }
     };
 
+    const onWheel = (event: WheelEvent) => {
+      const sequencerBodyElement = sequencerBody.value;
+      if (sequencerBodyElement && event.ctrlKey) {
+        // カーソル位置を基準に水平方向のズームを行う
+        const oldZoomX = zoomX.value;
+        const scrollLeft = sequencerBodyElement.scrollLeft;
+        const scrollTop = sequencerBodyElement.scrollTop;
+        const cursorX = event.offsetX - scrollLeft;
+
+        let newZoomX = zoomX.value;
+        newZoomX -= event.deltaY * (ZOOM_X_STEP * 0.01);
+        newZoomX = Math.min(ZOOM_X_MAX, newZoomX);
+        newZoomX = Math.max(ZOOM_X_MIN, newZoomX);
+
+        store.dispatch("SET_ZOOM_X", { zoomX: newZoomX }).then(() => {
+          const cursorBaseX = (scrollLeft + cursorX) / oldZoomX;
+          const newScrollLeft = cursorBaseX * newZoomX - cursorX;
+          sequencerBodyElement.scrollTo(newScrollLeft, scrollTop);
+        });
+      }
+    };
+
     const onScroll = (event: Event) => {
       if (event.target instanceof HTMLElement) {
         scrollX.value = event.target.scrollLeft;
@@ -621,17 +652,25 @@ export default defineComponent({
     };
 
     onMounted(() => {
-      const el = document.querySelector("#sequencer-body");
-      // 上から2/3の位置がC4になるようにスクロールする
-      if (el) {
-        const c4BaseY = noteNumberToBaseY(60);
-        const clientBaseHeight = el.clientHeight / zoomY.value;
-        const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
-        el.scrollTo(0, scrollBaseY * zoomY.value);
+      const sequencerBodyElement = sequencerBody.value;
+      if (!sequencerBodyElement) {
+        throw new Error("sequencerBodyElement is null.");
       }
+      // 上から2/3の位置がC4になるようにスクロールする
+      const clientHeight = sequencerBodyElement.clientHeight;
+      const c4BaseY = noteNumberToBaseY(60);
+      const clientBaseHeight = clientHeight / zoomY.value;
+      const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
+      sequencerBodyElement.scrollTo(0, scrollBaseY * zoomY.value);
     });
 
     return {
+      ZOOM_X_MIN,
+      ZOOM_X_MAX,
+      ZOOM_X_STEP,
+      ZOOM_Y_MIN,
+      ZOOM_Y_MAX,
+      ZOOM_Y_STEP,
       beatsPerMeasure,
       beatWidth,
       gridCellWidth,
@@ -646,6 +685,7 @@ export default defineComponent({
       cursorY,
       scrollX,
       scrollY,
+      sequencerBody,
       setZoomX,
       setZoomY,
       addNote,
@@ -656,6 +696,7 @@ export default defineComponent({
       handleDragMoveStart,
       handleDragRightStart,
       handleDragLeftStart,
+      onWheel,
       onScroll,
     };
   },
@@ -668,10 +709,9 @@ export default defineComponent({
 
 .score-sequencer {
   backface-visibility: hidden;
-
-  &.move {
-    cursor: move;
-  }
+  display: grid;
+  grid-template-rows: 30px 1fr;
+  grid-template-columns: 48px 1fr;
 }
 
 .corner {
@@ -684,6 +724,10 @@ export default defineComponent({
   backface-visibility: hidden;
   overflow: auto;
   position: relative;
+
+  &.move {
+    cursor: move;
+  }
 }
 
 .sequencer-grid {
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index d48c10d2b2..1ef733515b 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sequencer-keys">
+  <div ref="sequencerKeys" class="sequencer-keys">
     <svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height">
       <defs>
         <symbol id="white-keys">
@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed } from "vue";
+import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
 import { useStore } from "@/store";
 import { keyInfos, getKeyBaseHeight } from "@/helpers/singHelper";
 
@@ -53,11 +53,11 @@ export default defineComponent({
   name: "SingSequencerKeys",
   props: {
     offset: { type: Number, default: 0 },
-    width: { type: Number, default: 48 },
     blackKeyWidth: { type: Number, default: 30 },
   },
   setup(props) {
     const store = useStore();
+    const width = ref(48);
     const zoomX = computed(() => store.state.sequencerZoomX);
     const zoomY = computed(() => store.state.sequencerZoomY);
     const keyBaseHeight = getKeyBaseHeight();
@@ -86,7 +86,7 @@ export default defineComponent({
         return {
           x: -2,
           y: Math.floor(value * zoomY.value),
-          width: props.width + 2,
+          width: width.value + 2,
           height:
             Math.floor(nextValue * zoomY.value) -
             Math.floor(value * zoomY.value),
@@ -104,15 +104,45 @@ export default defineComponent({
       });
     });
 
+    const sequencerKeys = ref<HTMLElement | null>(null);
+    let resizeObserver: ResizeObserver | undefined;
+
+    onMounted(() => {
+      const sequencerKeysElement = sequencerKeys.value;
+      if (!sequencerKeysElement) {
+        throw new Error("sequencerKeysElement is null.");
+      }
+      resizeObserver = new ResizeObserver((entries) => {
+        let inlineSize = 0;
+        for (const entry of entries) {
+          for (const borderBoxSize of entry.borderBoxSize) {
+            inlineSize = borderBoxSize.inlineSize;
+          }
+        }
+        if (inlineSize > 0 && inlineSize !== width.value) {
+          width.value = inlineSize;
+        }
+      });
+      resizeObserver.observe(sequencerKeysElement);
+    });
+
+    onUnmounted(() => {
+      if (resizeObserver) {
+        resizeObserver.disconnect();
+      }
+    });
+
     return {
       keyInfos,
       zoomX,
       zoomY,
+      width,
       height,
       whiteKeyInfos,
       blackKeyInfos,
       whiteKeyRects,
       blackKeyRects,
+      sequencerKeys,
     };
   },
 });
@@ -124,7 +154,8 @@ export default defineComponent({
 
 .sequencer-keys {
   backface-visibility: hidden;
-  background: #ccc;
+  background: colors.$background;
+  border-right: 1px solid #ccc;
   overflow: hidden;
 }
 
diff --git a/src/components/Sing/SequencerRuler.vue b/src/components/Sing/SequencerRuler.vue
index 6e81dd2bd2..129cb4ba02 100644
--- a/src/components/Sing/SequencerRuler.vue
+++ b/src/components/Sing/SequencerRuler.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sequencer-ruler">
+  <div ref="sequencerRuler" class="sequencer-ruler">
     <svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height">
       <defs>
         <pattern
@@ -50,7 +50,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed } from "vue";
+import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
 import { useStore } from "@/store";
 import {
   getMeasureDuration,
@@ -62,12 +62,12 @@ export default defineComponent({
   name: "SingSequencerRuler",
   props: {
     offset: { type: Number, default: 0 },
-    height: { type: Number, default: 32 },
     numOfMeasures: { type: Number, default: 32 },
   },
   setup(props) {
     const store = useStore();
     const state = store.state;
+    const height = ref(32);
     const tpqn = computed(() => state.score.tpqn);
     const timeSignatures = computed(() => state.score.timeSignatures);
     const zoomX = computed(() => state.sequencerZoomX);
@@ -125,10 +125,40 @@ export default defineComponent({
       return measureInfos;
     });
 
+    const sequencerRuler = ref<HTMLElement | null>(null);
+    let resizeObserver: ResizeObserver | undefined;
+
+    onMounted(() => {
+      const sequencerRulerElement = sequencerRuler.value;
+      if (!sequencerRulerElement) {
+        throw new Error("sequencerRulerElement is null.");
+      }
+      resizeObserver = new ResizeObserver((entries) => {
+        let blockSize = 0;
+        for (const entry of entries) {
+          for (const borderBoxSize of entry.borderBoxSize) {
+            blockSize = borderBoxSize.blockSize;
+          }
+        }
+        if (blockSize > 0 && blockSize !== height.value) {
+          height.value = blockSize;
+        }
+      });
+      resizeObserver.observe(sequencerRulerElement);
+    });
+
+    onUnmounted(() => {
+      if (resizeObserver) {
+        resizeObserver.disconnect();
+      }
+    });
+
     return {
       measureWidth,
       width,
+      height,
       measureInfos,
+      sequencerRuler,
     };
   },
 });

From e4a308bc2739e00ba87cb5f234258157a2bbbfde Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 20 Nov 2023 19:23:05 +0900
Subject: [PATCH 31/59] =?UTF-8?q?[project-s]=20=E5=86=8D=E7=94=9F=E3=83=98?=
 =?UTF-8?q?=E3=83=83=E3=83=89=E3=81=AE=E6=8F=8F=E7=94=BB=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=81=A8=E3=82=AA=E3=83=BC=E3=83=88=E3=82=B9=E3=82=AF=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=82=92=E5=AE=9F=E8=A3=85=20(#1649)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue | 126 +++++++++++++++++++++----
 src/components/Sing/SequencerKeys.vue  |   4 +-
 src/components/Sing/SequencerRuler.vue |  52 +++++++++-
 src/components/Sing/ToolBar.vue        |  72 +++++++-------
 src/helpers/singHelper.ts              |  92 ++++++++++++++++++
 src/store/singing.ts                   |  54 ++++++++---
 src/store/type.ts                      |  12 ++-
 src/views/SingerHome.vue               |   2 +-
 8 files changed, 338 insertions(+), 76 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 37af5b310a..6981143009 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -18,14 +18,13 @@
       @scroll="onScroll"
     >
       <!-- グリッド -->
-      <!-- NOTE: 現状小節+オクターブごとの罫線なし -->
+      <!-- NOTE: 現状オクターブごとの罫線なし -->
       <svg
-        :width="gridCellWidth * numOfGridColumns"
-        :height="gridCellHeight * keyInfos.length"
+        :width="gridWidth"
+        :height="gridHeight"
         xmlns="http://www.w3.org/2000/svg"
         class="sequencer-grid"
       >
-        <!-- パターングリッド -->
         <defs>
           <pattern
             id="sequencer-grid-octave-cells"
@@ -47,7 +46,7 @@
             id="sequencer-grid-measure"
             patternUnits="userSpaceOnUse"
             :width="beatWidth * beatsPerMeasure"
-            :height="gridCellHeight * keyInfos.length"
+            :height="gridHeight"
           >
             <line
               v-for="n in beatsPerMeasure"
@@ -96,6 +95,20 @@
         @handleDragRightStart="handleDragRightStart"
         @handleDragLeftStart="handleDragLeftStart"
       />
+      <div
+        class="sequencer-body-playhead-wrapper"
+        :style="{
+          width: `${gridWidth}px`,
+          height: `${gridHeight}px`,
+        }"
+      >
+        <div
+          class="sequencer-body-playhead"
+          :style="{
+            transform: `translateX(${playheadX}px)`,
+          }"
+        ></div>
+      </div>
     </div>
     <!-- NOTE: スクロールバー+ズームレンジ仮 -->
     <input
@@ -133,7 +146,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref, onMounted } from "vue";
+import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
 import { v4 as uuidv4 } from "uuid";
 import { useStore } from "@/store";
 import SequencerRuler from "@/components/Sing/SequencerRuler.vue";
@@ -230,16 +243,6 @@ export default defineComponent({
         ) + 1
       );
     });
-    const numOfGridColumns = computed(() => {
-      // TODO: 複数拍子に対応する
-      const beats = timeSignatures.value[0].beats;
-      const beatType = timeSignatures.value[0].beatType;
-      const measureDuration = getMeasureDuration(beats, beatType, tpqn.value);
-      const numOfGridColumnsPerMeasure = Math.round(
-        measureDuration / gridCellTicks.value
-      );
-      return numOfGridColumnsPerMeasure * numOfMeasures.value;
-    });
     const beatsPerMeasure = computed(() => {
       return timeSignatures.value[0].beats;
     });
@@ -249,9 +252,27 @@ export default defineComponent({
       const beatTicks = wholeNoteDuration / beatType;
       return tickToBaseX(beatTicks, tpqn.value) * zoomX.value;
     });
+    const gridWidth = computed(() => {
+      // TODO: 複数拍子に対応する
+      const beats = timeSignatures.value[0].beats;
+      const beatType = timeSignatures.value[0].beatType;
+      const measureDuration = getMeasureDuration(beats, beatType, tpqn.value);
+      const numOfGridColumns =
+        Math.round(measureDuration / gridCellTicks.value) * numOfMeasures.value;
+      return gridCellWidth.value * numOfGridColumns;
+    });
+    const gridHeight = computed(() => {
+      return gridCellHeight.value * keyInfos.length;
+    });
     // スクロール位置
     const scrollX = ref(0);
     const scrollY = ref(0);
+    // 再生ヘッドの位置
+    const playheadTicks = ref(0);
+    const playheadX = computed(() => {
+      const baseX = tickToBaseX(playheadTicks.value, tpqn.value);
+      return Math.floor(baseX * zoomX.value);
+    });
     const selectedNoteIds = computed(() => state.selectedNoteIds);
 
     const sequencerBody = ref<HTMLElement | null>(null);
@@ -488,7 +509,10 @@ export default defineComponent({
     // X軸ズーム
     const setZoomX = (event: Event) => {
       const sequencerBodyElement = sequencerBody.value;
-      if (event.target instanceof HTMLInputElement && sequencerBodyElement) {
+      if (!sequencerBodyElement) {
+        throw new Error("sequencerBodyElement is null.");
+      }
+      if (event.target instanceof HTMLInputElement) {
         // 画面の中央を基準に水平方向のズームを行う
         const oldZoomX = zoomX.value;
         const newZoomX = Number(event.target.value);
@@ -507,7 +531,10 @@ export default defineComponent({
     // Y軸ズーム
     const setZoomY = (event: Event) => {
       const sequencerBodyElement = sequencerBody.value;
-      if (event.target instanceof HTMLInputElement && sequencerBodyElement) {
+      if (!sequencerBodyElement) {
+        throw new Error("sequencerBodyElement is null.");
+      }
+      if (event.target instanceof HTMLInputElement) {
         // 画面の中央を基準に垂直方向のズームを行う
         const oldZoomY = zoomY.value;
         const newZoomY = Number(event.target.value);
@@ -624,7 +651,10 @@ export default defineComponent({
 
     const onWheel = (event: WheelEvent) => {
       const sequencerBodyElement = sequencerBody.value;
-      if (sequencerBodyElement && event.ctrlKey) {
+      if (!sequencerBodyElement) {
+        throw new Error("sequencerBodyElement is null.");
+      }
+      if (event.ctrlKey) {
         // カーソル位置を基準に水平方向のズームを行う
         const oldZoomX = zoomX.value;
         const scrollLeft = sequencerBodyElement.scrollLeft;
@@ -651,6 +681,30 @@ export default defineComponent({
       }
     };
 
+    const playheadPositionChangeListener = (position: number) => {
+      playheadTicks.value = position;
+
+      // オートスクロール
+      const sequencerBodyElement = sequencerBody.value;
+      if (!sequencerBodyElement) {
+        throw new Error("sequencerBodyElement is null.");
+      }
+      const scrollLeft = sequencerBodyElement.scrollLeft;
+      const scrollTop = sequencerBodyElement.scrollTop;
+      const scrollWidth = sequencerBodyElement.scrollWidth;
+      const clientWidth = sequencerBodyElement.clientWidth;
+      const playheadX = tickToBaseX(position, tpqn.value) * zoomX.value;
+      const tolerance = 3;
+      if (playheadX < scrollLeft) {
+        sequencerBodyElement.scrollTo(playheadX, scrollTop);
+      } else if (
+        scrollLeft < scrollWidth - clientWidth - tolerance &&
+        playheadX >= scrollLeft + clientWidth
+      ) {
+        sequencerBodyElement.scrollTo(playheadX, scrollTop);
+      }
+    };
+
     onMounted(() => {
       const sequencerBodyElement = sequencerBody.value;
       if (!sequencerBodyElement) {
@@ -662,6 +716,16 @@ export default defineComponent({
       const clientBaseHeight = clientHeight / zoomY.value;
       const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
       sequencerBodyElement.scrollTo(0, scrollBaseY * zoomY.value);
+
+      store.dispatch("ADD_PLAYHEAD_POSITION_CHANGE_LISTENER", {
+        listener: playheadPositionChangeListener,
+      });
+    });
+
+    onUnmounted(() => {
+      store.dispatch("REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER", {
+        listener: playheadPositionChangeListener,
+      });
     });
 
     return {
@@ -676,7 +740,8 @@ export default defineComponent({
       gridCellWidth,
       gridCellHeight,
       numOfMeasures,
-      numOfGridColumns,
+      gridWidth,
+      gridHeight,
       keyInfos,
       notes,
       zoomX,
@@ -685,6 +750,7 @@ export default defineComponent({
       cursorY,
       scrollX,
       scrollY,
+      playheadX,
       sequencerBody,
       setZoomX,
       setZoomY,
@@ -730,6 +796,26 @@ export default defineComponent({
   }
 }
 
+.sequencer-body-playhead-wrapper {
+  position: absolute;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.sequencer-body-playhead {
+  position: absolute;
+  top: 0;
+  left: -2px;
+  width: 4px;
+  height: 100%;
+  background: colors.$primary;
+  border-left: 1px solid rgba(colors.$background-rgb, 0.83);
+  border-right: 1px solid rgba(colors.$background-rgb, 0.83);
+  pointer-events: none;
+}
+
 .sequencer-grid {
   display: block;
 }
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index 1ef733515b..d61dd2e787 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -127,9 +127,7 @@ export default defineComponent({
     });
 
     onUnmounted(() => {
-      if (resizeObserver) {
-        resizeObserver.disconnect();
-      }
+      resizeObserver?.disconnect();
     });
 
     return {
diff --git a/src/components/Sing/SequencerRuler.vue b/src/components/Sing/SequencerRuler.vue
index 129cb4ba02..6f0cf1e999 100644
--- a/src/components/Sing/SequencerRuler.vue
+++ b/src/components/Sing/SequencerRuler.vue
@@ -46,6 +46,13 @@
       />
       <use href="#sequencer-ruler-measure-numbers" :x="-offset" />
     </svg>
+    <div class="sequencer-ruler-border-bottom"></div>
+    <div
+      class="sequencer-ruler-playhead"
+      :style="{
+        transform: `translateX(${playheadX - offset}px)`,
+      }"
+    ></div>
   </div>
 </template>
 
@@ -68,6 +75,7 @@ export default defineComponent({
     const store = useStore();
     const state = store.state;
     const height = ref(32);
+    const playheadTicks = ref(0);
     const tpqn = computed(() => state.score.tpqn);
     const timeSignatures = computed(() => state.score.timeSignatures);
     const zoomX = computed(() => state.sequencerZoomX);
@@ -124,10 +132,18 @@ export default defineComponent({
       }
       return measureInfos;
     });
+    const playheadX = computed(() => {
+      const baseX = tickToBaseX(playheadTicks.value, tpqn.value);
+      return Math.floor(baseX * zoomX.value);
+    });
 
     const sequencerRuler = ref<HTMLElement | null>(null);
     let resizeObserver: ResizeObserver | undefined;
 
+    const playheadPositionChangeListener = (position: number) => {
+      playheadTicks.value = position;
+    };
+
     onMounted(() => {
       const sequencerRulerElement = sequencerRuler.value;
       if (!sequencerRulerElement) {
@@ -145,12 +161,18 @@ export default defineComponent({
         }
       });
       resizeObserver.observe(sequencerRulerElement);
+
+      store.dispatch("ADD_PLAYHEAD_POSITION_CHANGE_LISTENER", {
+        listener: playheadPositionChangeListener,
+      });
     });
 
     onUnmounted(() => {
-      if (resizeObserver) {
-        resizeObserver.disconnect();
-      }
+      resizeObserver?.disconnect();
+
+      store.dispatch("REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER", {
+        listener: playheadPositionChangeListener,
+      });
     });
 
     return {
@@ -158,6 +180,7 @@ export default defineComponent({
       width,
       height,
       measureInfos,
+      playheadX,
       sequencerRuler,
     };
   },
@@ -170,10 +193,31 @@ export default defineComponent({
 
 .sequencer-ruler {
   background: colors.$background;
-  border-bottom: 1px solid #ccc;
+  position: relative;
   overflow: hidden;
 }
 
+.sequencer-ruler-border-bottom {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  border-bottom: 1px solid #ccc;
+}
+
+.sequencer-ruler-playhead {
+  position: absolute;
+  top: 0;
+  left: -2px;
+  width: 4px;
+  height: 100%;
+  background: colors.$primary;
+  border-left: 1px solid rgba(colors.$background-rgb, 0.83);
+  border-right: 1px solid rgba(colors.$background-rgb, 0.83);
+  pointer-events: none;
+}
+
 .sequencer-ruler-measure-number {
   fill: #555;
 }
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 7ea79f5788..3d2551d859 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -13,7 +13,7 @@
         round
         class="sing-transport-button"
         icon="skip_previous"
-        @click="seek(0)"
+        @click="goToZero"
       ></q-btn>
       <q-btn
         v-if="!nowPlaying"
@@ -30,7 +30,7 @@
         @click="stop"
       ></q-btn>
       <q-btn flat round class="sing-transport-button" icon="loop"></q-btn>
-      <div class="sing-playback-position">{{ playbackPositionStr }}</div>
+      <div class="sing-playhead-position">{{ playheadPositionStr }}</div>
       <q-input
         type="number"
         :model-value="bpmInputBuffer"
@@ -91,7 +91,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, watch, ref } from "vue";
+import {
+  defineComponent,
+  computed,
+  watch,
+  ref,
+  onMounted,
+  onUnmounted,
+} from "vue";
 import { useStore } from "@/store";
 import { BEAT_TYPES, getSnapTypes, isTriplet } from "@/helpers/singHelper";
 
@@ -155,17 +162,18 @@ export default defineComponent({
       beatTypeInputBuffer.value = beatType;
     };
 
-    const playPos = ref(0);
+    const playheadTicks = ref(0);
 
-    const playbackPositionStr = computed(() => {
-      const playTime = store.getters.TICK_TO_SECOND(playPos.value);
+    const playheadPositionStr = computed(() => {
+      const ticks = playheadTicks.value;
+      const time = store.getters.TICK_TO_SECOND(ticks);
 
-      const intPlayTime = Math.floor(playTime);
-      const min = Math.floor(intPlayTime / 60);
+      const intTime = Math.trunc(time);
+      const min = Math.trunc(intTime / 60);
       const minStr = String(min).padStart(2, "0");
-      const secStr = String(intPlayTime - min * 60).padStart(2, "0");
-      const match = String(playTime).match(/\.(\d+)$/);
-      const milliSecStr = (match?.[1] ?? "0").padEnd(3, "0").substring(0, 3);
+      const secStr = String(intTime - min * 60).padStart(2, "0");
+      const milliSec = Math.trunc((time - intTime) * 1000);
+      const milliSecStr = String(milliSec).padStart(3, "0");
 
       return `${minStr}:${secStr}.${milliSecStr}`;
     });
@@ -190,21 +198,6 @@ export default defineComponent({
       { deep: true }
     );
 
-    const timeout = 1 / 60;
-    let timeoutId: number | undefined = undefined;
-    watch(nowPlaying, (newState) => {
-      if (newState) {
-        const updateView = () => {
-          playPos.value = store.getters.GET_PLAYBACK_POSITION();
-          timeoutId = window.setTimeout(updateView, timeout);
-        };
-        updateView();
-      } else if (timeoutId !== undefined) {
-        window.clearTimeout(timeoutId);
-        timeoutId = undefined;
-      }
-    });
-
     const setTempo = async () => {
       const bpm = bpmInputBuffer.value;
       if (bpm === 0) return;
@@ -237,9 +230,8 @@ export default defineComponent({
       store.dispatch("SING_STOP_AUDIO");
     };
 
-    const seek = async (position: number) => {
-      await store.dispatch("SET_PLAYBACK_POSITION", { position });
-      playPos.value = position;
+    const goToZero = () => {
+      store.dispatch("SET_PLAYHEAD_POSITION", { position: 0 });
     };
 
     const volume = computed({
@@ -285,6 +277,22 @@ export default defineComponent({
       },
     });
 
+    const playheadPositionChangeListener = (position: number) => {
+      playheadTicks.value = position;
+    };
+
+    onMounted(() => {
+      store.dispatch("ADD_PLAYHEAD_POSITION_CHANGE_LISTENER", {
+        listener: playheadPositionChangeListener,
+      });
+    });
+
+    onUnmounted(() => {
+      store.dispatch("REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER", {
+        listener: playheadPositionChangeListener,
+      });
+    });
+
     return {
       isShowSinger,
       toggleShowSinger,
@@ -297,11 +305,11 @@ export default defineComponent({
       setBeatTypeInputBuffer,
       setTempo,
       setTimeSignature,
-      playbackPositionStr,
+      playheadPositionStr,
       nowPlaying,
       play,
       stop,
-      seek,
+      goToZero,
       volume,
       snapTypeSelectOptions,
       snapTypeSelectModel,
@@ -372,7 +380,7 @@ export default defineComponent({
   width: 36px;
 }
 
-.sing-playback-position {
+.sing-playhead-position {
   font-size: 18px;
   margin: 0 4px;
   min-width: 82px;
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index 87f086d973..9ac118a7b6 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -210,3 +210,95 @@ export function round(value: number, digits: number) {
   const powerOf10 = 10 ** digits;
   return Math.round(value * powerOf10) / powerOf10;
 }
+
+/**
+ * 頻繁に変更される値を保持します。
+ * 値変更時に実行する関数を登録できます。
+ */
+export class FrequentlyUpdatedState<T> {
+  private _value: T;
+  private listeners = new Set<(newValue: T) => void>();
+
+  get value() {
+    return this._value;
+  }
+
+  set value(newValue: T) {
+    this._value = newValue;
+    this.listeners.forEach((listener) => listener(newValue));
+  }
+
+  constructor(initialValue: T) {
+    this._value = initialValue;
+  }
+
+  addValueChangeListener(listener: (newValue: T) => void) {
+    if (this.listeners.has(listener)) {
+      throw new Error("The listener already exists.");
+    }
+    this.listeners.add(listener);
+    listener(this.value);
+  }
+
+  removeValueChangeListener(listener: (newValue: T) => void) {
+    if (!this.listeners.has(listener)) {
+      throw new Error("The listener does not exist.");
+    }
+    this.listeners.delete(listener);
+  }
+}
+
+/**
+ * requestAnimationFrameを使用して関数を定期的に実行します。
+ * 関数は、指定した最大フレームレート以下で実行されます。
+ */
+export class AnimationFrameRunner {
+  private readonly maxFrameTime: number;
+  private readonly maxDiff: number;
+
+  private requestId?: number;
+  private prevTimeStamp?: number;
+  private diff = 0;
+
+  get isStarted() {
+    return this.requestId !== undefined;
+  }
+
+  constructor(maxFrameRate = 60) {
+    this.maxFrameTime = 1000 / maxFrameRate;
+    this.maxDiff = this.maxFrameTime * 10;
+  }
+
+  start(onAnimationFrame: () => void) {
+    if (this.requestId !== undefined) {
+      throw new Error("The animation frame runner is already started.");
+    }
+
+    this.diff = 0;
+    this.prevTimeStamp = undefined;
+
+    const callback = (timeStamp: number) => {
+      if (this.prevTimeStamp === undefined) {
+        this.diff += this.maxFrameTime;
+      } else {
+        this.diff += timeStamp - this.prevTimeStamp;
+      }
+      this.diff = Math.min(this.maxDiff, this.diff);
+      if (this.diff >= this.maxFrameTime) {
+        this.diff -= this.maxFrameTime;
+        onAnimationFrame();
+      }
+      this.prevTimeStamp = timeStamp;
+      this.requestId = window.requestAnimationFrame(callback);
+    };
+    this.requestId = window.requestAnimationFrame(callback);
+  }
+
+  stop() {
+    if (this.requestId === undefined) {
+      throw new Error("The animation frame runner is not started.");
+    }
+    window.cancelAnimationFrame(this.requestId);
+    this.requestId = undefined;
+  }
+}
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 4b28dacefa..ef3f0edfb1 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -39,6 +39,8 @@ import {
   isValidSnapType,
   noteNumberToFrequency,
   round,
+  FrequentlyUpdatedState,
+  AnimationFrameRunner,
 } from "@/helpers/singHelper";
 import { AudioQuery, Mora } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
@@ -291,9 +293,10 @@ if (window.AudioContext) {
   clipper.output.connect(audioContext.destination);
 }
 
-let playbackPosition = 0;
+const playheadPosition = new FrequentlyUpdatedState(0);
 const allPhrases = new Map<string, Phrase>();
 const phraseAudioBlobCache = new Map<string, Blob>();
+const animationFrameRunner = new AnimationFrameRunner();
 
 export const singingStoreState: SingingStoreState = {
   singer: undefined,
@@ -409,7 +412,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       }
       commit("CLEAR_SELECTED_NOTE_IDS");
       commit("SET_SCORE", { score });
-      transport.time = getters.TICK_TO_SECOND(playbackPosition);
+      transport.time = getters.TICK_TO_SECOND(playheadPosition.value);
 
       dispatch("RENDER");
     },
@@ -441,11 +444,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         throw new Error("The tempo is invalid.");
       }
       if (state.nowPlaying) {
-        playbackPosition = getters.SECOND_TO_TICK(transport.time);
+        playheadPosition.value = getters.SECOND_TO_TICK(transport.time);
       }
       tempo.bpm = round(tempo.bpm, 2);
       commit("SET_TEMPO", { tempo });
-      transport.time = getters.TICK_TO_SECOND(playbackPosition);
+      transport.time = getters.TICK_TO_SECOND(playheadPosition.value);
 
       dispatch("RENDER");
     },
@@ -485,10 +488,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         throw new Error("transport is undefined.");
       }
       if (state.nowPlaying) {
-        playbackPosition = getters.SECOND_TO_TICK(transport.time);
+        playheadPosition.value = getters.SECOND_TO_TICK(transport.time);
       }
       commit("REMOVE_TEMPO", { position });
-      transport.time = getters.TICK_TO_SECOND(playbackPosition);
+      transport.time = getters.TICK_TO_SECOND(playheadPosition.value);
 
       dispatch("RENDER");
     },
@@ -748,28 +751,40 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  GET_PLAYBACK_POSITION: {
+  GET_PLAYHEAD_POSITION: {
     getter: (state, getters) => () => {
       if (!transport) {
         throw new Error("transport is undefined.");
       }
       if (state.nowPlaying) {
-        playbackPosition = getters.SECOND_TO_TICK(transport.time);
+        playheadPosition.value = getters.SECOND_TO_TICK(transport.time);
       }
-      return playbackPosition;
+      return playheadPosition.value;
     },
   },
 
-  SET_PLAYBACK_POSITION: {
-    async action({ getters }, { position }) {
+  SET_PLAYHEAD_POSITION: {
+    async action({ getters }, { position }: { position: number }) {
       if (!transport) {
         throw new Error("transport is undefined.");
       }
-      playbackPosition = position;
+      playheadPosition.value = position;
       transport.time = getters.TICK_TO_SECOND(position);
     },
   },
 
+  ADD_PLAYHEAD_POSITION_CHANGE_LISTENER: {
+    async action(_, { listener }: { listener: (position: number) => void }) {
+      playheadPosition.addValueChangeListener(listener);
+    },
+  },
+
+  REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER: {
+    async action(_, { listener }: { listener: (position: number) => void }) {
+      playheadPosition.removeValueChangeListener(listener);
+    },
+  },
+
   SET_LEFT_LOCATOR_POSITION: {
     mutation(state, { position }) {
       state.leftLocatorPosition = position;
@@ -795,24 +810,35 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
   },
 
   SING_PLAY_AUDIO: {
-    async action({ commit }) {
+    async action({ state, getters, commit }) {
+      if (state.nowPlaying) {
+        return;
+      }
       if (!transport) {
         throw new Error("transport is undefined.");
       }
       commit("SET_PLAYBACK_STATE", { nowPlaying: true });
 
       transport.start();
+      animationFrameRunner.start(() => {
+        playheadPosition.value = getters.GET_PLAYHEAD_POSITION();
+      });
     },
   },
 
   SING_STOP_AUDIO: {
-    async action({ commit }) {
+    async action({ state, getters, commit }) {
+      if (!state.nowPlaying) {
+        return;
+      }
       if (!transport) {
         throw new Error("transport is undefined.");
       }
       commit("SET_PLAYBACK_STATE", { nowPlaying: false });
 
       transport.stop();
+      animationFrameRunner.stop();
+      playheadPosition.value = getters.GET_PLAYHEAD_POSITION();
     },
   },
 
diff --git a/src/store/type.ts b/src/store/type.ts
index 898bf66493..617430b3a8 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -888,14 +888,22 @@ export type SingingStoreTypes = {
     getter(time: number): number;
   };
 
-  GET_PLAYBACK_POSITION: {
+  GET_PLAYHEAD_POSITION: {
     getter(): number;
   };
 
-  SET_PLAYBACK_POSITION: {
+  SET_PLAYHEAD_POSITION: {
     action(payload: { position: number }): void;
   };
 
+  ADD_PLAYHEAD_POSITION_CHANGE_LISTENER: {
+    action(payload: { listener: (position: number) => void }): void;
+  };
+
+  REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER: {
+    action(payload: { listener: (position: number) => void }): void;
+  };
+
   SET_LEFT_LOCATOR_POSITION: {
     mutation: { position: number };
     action(payload: { position: number }): void;
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index d394a837ba..efb3209b04 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -71,7 +71,7 @@ export default defineComponent({
       await store.dispatch("SET_SINGER", {});
 
       await store.dispatch("SET_VOLUME", { volume: 0.3 });
-      await store.dispatch("SET_PLAYBACK_POSITION", { position: 0 });
+      await store.dispatch("SET_PLAYHEAD_POSITION", { position: 0 });
       await store.dispatch("SET_LEFT_LOCATOR_POSITION", {
         position: 0,
       });

From 3a7524b6c0e77ae2c154dc774a58d46014dd0850 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 23 Nov 2023 10:24:46 +0900
Subject: [PATCH 32/59] =?UTF-8?q?[project-s]=20=E5=86=8D=E7=94=9F=E3=83=98?=
 =?UTF-8?q?=E3=83=83=E3=83=89=E3=81=AE=E4=BD=8D=E7=BD=AE=E3=82=92=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=20(#1658)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue |  6 ++++--
 src/components/Sing/SequencerRuler.vue | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 6981143009..d7dc06e4eb 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -655,11 +655,13 @@ export default defineComponent({
         throw new Error("sequencerBodyElement is null.");
       }
       if (event.ctrlKey) {
-        // カーソル位置を基準に水平方向のズームを行う
+        // マウスカーソル位置を基準に水平方向のズームを行う
         const oldZoomX = zoomX.value;
         const scrollLeft = sequencerBodyElement.scrollLeft;
         const scrollTop = sequencerBodyElement.scrollTop;
-        const cursorX = event.offsetX - scrollLeft;
+        const clientRect = sequencerBodyElement.getBoundingClientRect();
+        // sequencerBody要素のborderとpaddingが0であることを前提にマウスカーソル位置を算出
+        const cursorX = event.clientX - clientRect.left;
 
         let newZoomX = zoomX.value;
         newZoomX -= event.deltaY * (ZOOM_X_STEP * 0.01);
diff --git a/src/components/Sing/SequencerRuler.vue b/src/components/Sing/SequencerRuler.vue
index 6f0cf1e999..ac8ed663f5 100644
--- a/src/components/Sing/SequencerRuler.vue
+++ b/src/components/Sing/SequencerRuler.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="sequencerRuler" class="sequencer-ruler">
+  <div ref="sequencerRuler" class="sequencer-ruler" @click="onClick">
     <svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height">
       <defs>
         <pattern
@@ -60,6 +60,7 @@
 import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
 import { useStore } from "@/store";
 import {
+  baseXToTick,
   getMeasureDuration,
   getTimeSignaturePositions,
   tickToBaseX,
@@ -137,6 +138,16 @@ export default defineComponent({
       return Math.floor(baseX * zoomX.value);
     });
 
+    const onClick = (event: MouseEvent) => {
+      const sequencerRulerElement = sequencerRuler.value;
+      if (!sequencerRulerElement) {
+        throw new Error("sequencerRulerElement is null.");
+      }
+      const baseX = (props.offset + event.offsetX) / zoomX.value;
+      const ticks = baseXToTick(baseX, tpqn.value);
+      store.dispatch("SET_PLAYHEAD_POSITION", { position: ticks });
+    };
+
     const sequencerRuler = ref<HTMLElement | null>(null);
     let resizeObserver: ResizeObserver | undefined;
 
@@ -182,6 +193,7 @@ export default defineComponent({
       measureInfos,
       playheadX,
       sequencerRuler,
+      onClick,
     };
   },
 });

From 1a4563fb06c2d646b2626fc8493b0144d3985bb7 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Tue, 28 Nov 2023 17:44:11 +0900
Subject: [PATCH 33/59] =?UTF-8?q?[project-s]=20=E9=9F=B3=E5=A3=B0=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D=E5=87=BA=E3=81=97=E6=99=82=E3=81=AB=E3=83=80=E3=82=A4?=
 =?UTF-8?q?=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=20(#1661)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/store/singing.ts          | 309 ++++++++++++++++++----------------
 src/store/type.ts             |  20 ++-
 src/views/SingerHome.vue      |  55 +++++-
 tests/unit/store/Vuex.spec.ts |   3 +-
 4 files changed, 236 insertions(+), 151 deletions(-)

diff --git a/src/store/singing.ts b/src/store/singing.ts
index ef3f0edfb1..13cd10e583 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -329,10 +329,11 @@ export const singingStoreState: SingingStoreState = {
   volume: 0,
   leftLocatorPosition: 0,
   rightLocatorPosition: 0,
-  renderingEnabled: false,
   startRenderingRequested: false,
   stopRenderingRequested: false,
   nowRendering: false,
+  exportingAudio: false,
+  cancellationOfAudioExportRequested: false,
 };
 
 export const singingStore = createPartialStore<SingingStoreTypes>({
@@ -1249,7 +1250,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       commit("SET_START_RENDERING_REQUESTED", {
         startRenderingRequested: true,
       });
-      if (!state.renderingEnabled || state.nowRendering) {
+      if (state.nowRendering) {
         return;
       }
 
@@ -1292,20 +1293,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     }),
   },
 
-  SET_RENDERING_ENABLED: {
-    mutation(state, { renderingEnabled }) {
-      state.renderingEnabled = renderingEnabled;
-    },
-    async action({ commit, dispatch }, { renderingEnabled }) {
-      if (renderingEnabled) {
-        dispatch("RENDER");
-      } else {
-        await dispatch("STOP_RENDERING");
-      }
-      commit("SET_RENDERING_ENABLED", { renderingEnabled });
-    },
-  },
-
   IMPORT_MIDI_FILE: {
     action: createUILockAction(
       async ({ dispatch }, { filePath }: { filePath?: string }) => {
@@ -1793,12 +1780,22 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     ),
   },
 
+  SET_EXPORTING_AUDIO: {
+    mutation(state, { exportingAudio }) {
+      state.exportingAudio = exportingAudio;
+    },
+  },
+
+  SET_CANCELLATION_OF_AUDIO_EXPORT_REQUESTED: {
+    mutation(state, { cancellationOfAudioExportRequested }) {
+      state.cancellationOfAudioExportRequested =
+        cancellationOfAudioExportRequested;
+    },
+  },
+
   EXPORT_WAVE_FILE: {
     action: createUILockAction(
-      async (
-        { state, getters, dispatch },
-        { filePath }
-      ): Promise<SaveResultObject> => {
+      async ({ state, getters, commit, dispatch }, { filePath }) => {
         const convertToWavFileData = (audioBuffer: AudioBuffer) => {
           const bytesPerSample = 4; // Float32
           const formatCode = 3; // WAVE_FORMAT_IEEE_FLOAT
@@ -1856,7 +1853,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return buffer;
         };
 
-        function generateWriteErrorMessage(writeFileResult: ResultError) {
+        const generateWriteErrorMessage = (writeFileResult: ResultError) => {
           if (writeFileResult.code) {
             const code = writeFileResult.code.toUpperCase();
 
@@ -1874,144 +1871,172 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           }
 
           return `何らかの理由で失敗しました。${writeFileResult.message}`;
-        }
-
-        if (!window.OfflineAudioContext) {
-          throw new Error("OfflineAudioContext is undefined.");
-        }
-
-        // TODO: ファイル名を設定できるようにする
-        const fileName = "test_export.wav";
+        };
 
-        const leftLocatorPos = state.leftLocatorPosition;
-        const rightLocatorPos = state.rightLocatorPosition;
-        const renderStartTime = getters.TICK_TO_SECOND(leftLocatorPos);
-        const renderEndTime = getters.TICK_TO_SECOND(rightLocatorPos);
-        const renderDuration = renderEndTime - renderStartTime;
+        const calcRenderDuration = () => {
+          const notes = state.score.notes;
+          if (notes.length === 0) {
+            return 1;
+          }
+          const lastNote = notes[notes.length - 1];
+          const lastNoteEndPosition = lastNote.position + lastNote.duration;
+          const lastNoteEndTime = getters.TICK_TO_SECOND(lastNoteEndPosition);
+          return Math.max(1, lastNoteEndTime + 1);
+        };
 
-        if (renderEndTime <= renderStartTime) {
-          // TODO: メッセージを表示するようにする
-          throw new Error("Invalid render range.");
-        }
+        const exportWaveFile = async (): Promise<SaveResultObject> => {
+          const fileName = "test_export.wav"; // TODO: 設定できるようにする
+          const numberOfChannels = 2;
+          const sampleRate = 48000; // TODO: 設定できるようにする
+          const withLimiter = false; // TODO: 設定できるようにする
 
-        if (state.nowPlaying) {
-          await dispatch("SING_STOP_AUDIO");
-        }
-        if (state.nowRendering) {
-          await dispatch("STOP_RENDERING");
-        }
+          const renderDuration = calcRenderDuration();
 
-        if (state.savingSetting.fixedExportEnabled) {
-          filePath = path.join(state.savingSetting.fixedExportDir, fileName);
-        } else {
-          filePath ??= await window.electron.showAudioSaveDialog({
-            title: "音声を保存",
-            defaultPath: fileName,
-          });
-        }
-        if (!filePath) {
-          return { result: "CANCELED", path: "" };
-        }
+          if (state.nowPlaying) {
+            await dispatch("SING_STOP_AUDIO");
+          }
 
-        if (state.savingSetting.avoidOverwrite) {
-          let tail = 1;
-          const name = filePath.slice(0, filePath.length - 4);
-          while (await window.electron.checkFileExists(filePath)) {
-            filePath = name + "[" + tail.toString() + "]" + ".wav";
-            tail += 1;
+          if (state.savingSetting.fixedExportEnabled) {
+            filePath = path.join(state.savingSetting.fixedExportDir, fileName);
+          } else {
+            filePath ??= await window.electron.showAudioSaveDialog({
+              title: "音声を保存",
+              defaultPath: fileName,
+            });
+          }
+          if (!filePath) {
+            return { result: "CANCELED", path: "" };
           }
-        }
 
-        const sampleRate = 48000; // TODO: 設定できるようにする
-        const withLimiter = false; // TODO: 設定できるようにする
+          if (state.savingSetting.avoidOverwrite) {
+            let tail = 1;
+            const name = filePath.slice(0, filePath.length - 4);
+            while (await window.electron.checkFileExists(filePath)) {
+              filePath = name + "[" + tail.toString() + "]" + ".wav";
+              tail += 1;
+            }
+          }
 
-        const offlineAudioContext = new OfflineAudioContext(
-          2,
-          sampleRate * renderDuration,
-          sampleRate
-        );
-        const offlineTransport = new OfflineTransport();
-        const channelStrip = new ChannelStrip(offlineAudioContext);
-        const limiter = withLimiter
-          ? new Limiter(offlineAudioContext)
-          : undefined;
-        const clipper = new Clipper(offlineAudioContext);
+          if (state.nowRendering) {
+            await createPromiseThatResolvesWhen(() => {
+              return (
+                !state.nowRendering || state.cancellationOfAudioExportRequested
+              );
+            });
+            if (state.cancellationOfAudioExportRequested) {
+              return { result: "CANCELED", path: "" };
+            }
+          }
 
-        for (const phrase of allPhrases.values()) {
-          // TODO: この辺りの処理を共通化する
-          if (phrase.startTime !== undefined && phrase.blob) {
-            // レンダリング済みのフレーズの場合
-            const audioEvents = await generateAudioEvents(
-              offlineAudioContext,
-              phrase.startTime,
-              phrase.blob
-            );
-            const audioPlayer = new AudioPlayer(offlineAudioContext);
-            audioPlayer.output.connect(channelStrip.input);
-            const audioSequence: AudioSequence = {
-              type: "audio",
-              audioPlayer,
-              audioEvents,
-            };
-            offlineTransport.addSequence(audioSequence);
+          const offlineAudioContext = new OfflineAudioContext(
+            numberOfChannels,
+            sampleRate * renderDuration,
+            sampleRate
+          );
+          const offlineTransport = new OfflineTransport();
+          const channelStrip = new ChannelStrip(offlineAudioContext);
+          const limiter = withLimiter
+            ? new Limiter(offlineAudioContext)
+            : undefined;
+          const clipper = new Clipper(offlineAudioContext);
+
+          for (const phrase of allPhrases.values()) {
+            // TODO: この辺りの処理を共通化する
+            if (phrase.startTime !== undefined && phrase.blob) {
+              // レンダリング済みのフレーズの場合
+              const audioEvents = await generateAudioEvents(
+                offlineAudioContext,
+                phrase.startTime,
+                phrase.blob
+              );
+              const audioPlayer = new AudioPlayer(offlineAudioContext);
+              audioPlayer.output.connect(channelStrip.input);
+              const audioSequence: AudioSequence = {
+                type: "audio",
+                audioPlayer,
+                audioEvents,
+              };
+              offlineTransport.addSequence(audioSequence);
+            } else {
+              // レンダリング未完了のフレーズの場合
+              const noteEvents = generateNoteEvents(
+                phrase.score.notes,
+                phrase.score.tempos,
+                phrase.score.tpqn
+              );
+              const polySynth = new PolySynth(offlineAudioContext);
+              polySynth.output.connect(channelStrip.input);
+              const noteSequence: NoteSequence = {
+                type: "note",
+                instrument: polySynth,
+                noteEvents,
+              };
+              offlineTransport.addSequence(noteSequence);
+            }
+          }
+          channelStrip.volume = 1;
+          if (limiter) {
+            channelStrip.output.connect(limiter.input);
+            limiter.output.connect(clipper.input);
           } else {
-            // レンダリング未完了のフレーズの場合
-            const noteEvents = generateNoteEvents(
-              phrase.score.notes,
-              phrase.score.tempos,
-              phrase.score.tpqn
-            );
-            const polySynth = new PolySynth(offlineAudioContext);
-            polySynth.output.connect(channelStrip.input);
-            const noteSequence: NoteSequence = {
-              type: "note",
-              instrument: polySynth,
-              noteEvents,
-            };
-            offlineTransport.addSequence(noteSequence);
+            channelStrip.output.connect(clipper.input);
           }
-        }
-        if (limiter) {
-          channelStrip.output.connect(limiter.input);
-          limiter.output.connect(clipper.input);
-        } else {
-          channelStrip.output.connect(clipper.input);
-        }
-        clipper.output.connect(offlineAudioContext.destination);
-
-        // スケジューリングを行い、オフラインレンダリングを実行
-        // TODO: オフラインレンダリング後にメモリーがきちんと開放されるか確認する
-        offlineTransport.schedule(renderStartTime, renderDuration);
-        const audioBuffer = await offlineAudioContext.startRendering();
-        const waveFileData = convertToWavFileData(audioBuffer);
-
-        try {
-          await window.electron
-            .writeFile({
-              filePath,
-              buffer: waveFileData,
-            })
-            .then(getValueOrThrow);
-        } catch (e) {
-          window.electron.logError(e);
-          if (e instanceof ResultError) {
+          clipper.output.connect(offlineAudioContext.destination);
+
+          // スケジューリングを行い、オフラインレンダリングを実行
+          // TODO: オフラインレンダリング後にメモリーがきちんと開放されるか確認する
+          offlineTransport.schedule(0, renderDuration);
+          const audioBuffer = await offlineAudioContext.startRendering();
+          const waveFileData = convertToWavFileData(audioBuffer);
+
+          try {
+            await window.electron
+              .writeFile({
+                filePath,
+                buffer: waveFileData,
+              })
+              .then(getValueOrThrow);
+          } catch (e) {
+            window.electron.logError(e);
+            if (e instanceof ResultError) {
+              return {
+                result: "WRITE_ERROR",
+                path: filePath,
+                errorMessage: generateWriteErrorMessage(e),
+              };
+            }
             return {
-              result: "WRITE_ERROR",
+              result: "UNKNOWN_ERROR",
               path: filePath,
-              errorMessage: generateWriteErrorMessage(e),
+              errorMessage:
+                (e instanceof Error ? e.message : String(e)) ||
+                "不明なエラーが発生しました。",
             };
           }
-          return {
-            result: "UNKNOWN_ERROR",
-            path: filePath,
-            errorMessage:
-              (e instanceof Error ? e.message : String(e)) ||
-              "不明なエラーが発生しました。",
-          };
-        }
 
-        return { result: "SUCCESS", path: filePath };
+          return { result: "SUCCESS", path: filePath };
+        };
+
+        commit("SET_EXPORTING_AUDIO", { exportingAudio: true });
+        return exportWaveFile().finally(() => {
+          commit("SET_CANCELLATION_OF_AUDIO_EXPORT_REQUESTED", {
+            cancellationOfAudioExportRequested: false,
+          });
+          commit("SET_EXPORTING_AUDIO", { exportingAudio: false });
+        });
       }
     ),
   },
+
+  CANCEL_AUDIO_EXPORT: {
+    async action({ state, commit, dispatch }) {
+      if (!state.exportingAudio) {
+        dispatch("LOG_WARN", "CANCEL_AUDIO_EXPORT on !exportingAudio");
+        return;
+      }
+      commit("SET_CANCELLATION_OF_AUDIO_EXPORT_REQUESTED", {
+        cancellationOfAudioExportRequested: true,
+      });
+    },
+  },
 });
diff --git a/src/store/type.ts b/src/store/type.ts
index 617430b3a8..35f5657025 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -761,10 +761,11 @@ export type SingingStoreState = {
   volume: number;
   leftLocatorPosition: number;
   rightLocatorPosition: number;
-  renderingEnabled: boolean;
   startRenderingRequested: boolean;
   stopRenderingRequested: boolean;
   nowRendering: boolean;
+  exportingAudio: boolean;
+  cancellationOfAudioExportRequested: boolean;
 };
 
 export type SingingStoreTypes = {
@@ -880,6 +881,10 @@ export type SingingStoreTypes = {
     action(payload: { filePath?: string }): SaveResultObject;
   };
 
+  CANCEL_AUDIO_EXPORT: {
+    action(): void;
+  };
+
   TICK_TO_SECOND: {
     getter(position: number): number;
   };
@@ -951,6 +956,14 @@ export type SingingStoreTypes = {
     mutation: { nowRendering: boolean };
   };
 
+  SET_EXPORTING_AUDIO: {
+    mutation: { exportingAudio: boolean };
+  };
+
+  SET_CANCELLATION_OF_AUDIO_EXPORT_REQUESTED: {
+    mutation: { cancellationOfAudioExportRequested: boolean };
+  };
+
   RENDER: {
     action(): void;
   };
@@ -958,11 +971,6 @@ export type SingingStoreTypes = {
   STOP_RENDERING: {
     action(): void;
   };
-
-  SET_RENDERING_ENABLED: {
-    mutation: { renderingEnabled: boolean };
-    action(payload: { renderingEnabled: boolean }): void;
-  };
 };
 
 /*
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index efb3209b04..df6ca2e390 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -3,6 +3,23 @@
   <menu-bar />
   <tool-bar />
   <div class="sing-main">
+    <div v-if="exportingAudio" class="exporting-dialog">
+      <div>
+        <q-spinner color="primary" size="2.5rem" />
+        <div class="q-mt-xs">
+          {{ nowRendering ? "レンダリング中・・・" : "音声を書き出し中・・・" }}
+        </div>
+        <q-btn
+          v-if="nowRendering"
+          padding="xs md"
+          label="音声の書き出しをキャンセル"
+          color="surface"
+          text-color="display"
+          class="q-mt-sm"
+          @click="cancelExport"
+        />
+      </div>
+    </div>
     <singer-panel />
     <score-sequencer />
   </div>
@@ -10,7 +27,7 @@
 
 <script lang="ts">
 import {
-  //computed,
+  computed,
   defineComponent,
   //onBeforeUpdate,
   onMounted,
@@ -47,6 +64,17 @@ export default defineComponent({
     const store = useStore();
     //const $q = useQuasar();
 
+    const nowRendering = computed(() => {
+      return store.state.nowRendering;
+    });
+    const exportingAudio = computed(() => {
+      return store.state.exportingAudio;
+    });
+
+    const cancelExport = () => {
+      store.dispatch("CANCEL_AUDIO_EXPORT");
+    };
+
     // 歌声合成エディターの初期化
     onMounted(async () => {
       await store.dispatch("SET_SCORE", {
@@ -78,9 +106,14 @@ export default defineComponent({
       await store.dispatch("SET_RIGHT_LOCATOR_POSITION", {
         position: 480 * 4 * 16,
       });
-      await store.dispatch("SET_RENDERING_ENABLED", { renderingEnabled: true });
       return {};
     });
+
+    return {
+      nowRendering,
+      exportingAudio,
+      cancelExport,
+    };
   },
 });
 </script>
@@ -96,4 +129,22 @@ export default defineComponent({
   display: flex;
   overflow: hidden;
 }
+
+.exporting-dialog {
+  background-color: rgba(colors.$display-rgb, 0.15);
+  position: absolute;
+  inset: 0;
+  z-index: 10;
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+
+  > div {
+    color: colors.$display;
+    background: colors.$surface;
+    border-radius: 6px;
+    padding: 14px;
+  }
+}
 </style>
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 0aa95c47c0..ad776bbd32 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -176,10 +176,11 @@ describe("store/vuex.js test", () => {
         volume: 0,
         leftLocatorPosition: 0,
         rightLocatorPosition: 0,
-        renderingEnabled: false,
         startRenderingRequested: false,
         stopRenderingRequested: false,
         nowRendering: false,
+        exportingAudio: false,
+        cancellationOfAudioExportRequested: false,
       },
       getters: {
         ...uiStore.getters,

From 46556c9e7108c2191cf5a6236444ad5f4e688c43 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 3 Dec 2023 20:33:48 +0900
Subject: [PATCH 34/59] =?UTF-8?q?[project-s]=20Phrase=E3=82=92=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=82=A2=E3=81=A7=E6=8C=81=E3=81=A4=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=20(#1663)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/singing.ts          | 219 ++++++++++++++++++++--------------
 src/store/type.ts             |  30 ++++-
 src/views/SingerHome.vue      |   8 +-
 tests/unit/store/Vuex.spec.ts |   3 +-
 4 files changed, 160 insertions(+), 100 deletions(-)

diff --git a/src/store/singing.ts b/src/store/singing.ts
index 13cd10e583..d5910dcb83 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -10,6 +10,7 @@ import {
   SingingStoreTypes,
   SaveResultObject,
   Singer,
+  Phrase,
 } from "./type";
 import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
@@ -179,18 +180,6 @@ const createPromiseThatResolvesWhen = (
   });
 };
 
-type Phrase = {
-  readonly singer: Singer | undefined;
-  readonly score: Score;
-  // renderingが進むに連れてデータが代入されていく
-  query?: AudioQuery;
-  queryHash?: string; // queryの変更を検知するためのハッシュ
-  blob?: Blob;
-  startTime?: number;
-  source?: Instrument | AudioPlayer; // ひとまずPhraseに持たせる
-  sequence?: Sequence; // ひとまずPhraseに持たせる
-};
-
 const generateSingerAndScoreHash = async (obj: {
   singer: Singer | undefined;
   score: Score;
@@ -198,10 +187,6 @@ const generateSingerAndScoreHash = async (obj: {
   return _generateHash(obj);
 };
 
-const generateAudioQueryHash = async (obj: AudioQuery) => {
-  return _generateHash(obj);
-};
-
 const isValidTpqn = (tpqn: number) => {
   return (
     Number.isInteger(tpqn) &&
@@ -293,8 +278,14 @@ if (window.AudioContext) {
   clipper.output.connect(audioContext.destination);
 }
 
+type PhraseData = {
+  blob?: Blob;
+  source?: Instrument | AudioPlayer; // ひとまずPhraseDataに持たせる
+  sequence?: Sequence; // ひとまずPhraseDataに持たせる
+};
+
 const playheadPosition = new FrequentlyUpdatedState(0);
-const allPhrases = new Map<string, Phrase>();
+const phraseDataMap = new Map<string, PhraseData>();
 const phraseAudioBlobCache = new Map<string, Blob>();
 const animationFrameRunner = new AnimationFrameRunner();
 
@@ -317,6 +308,7 @@ export const singingStoreState: SingingStoreState = {
     ],
     notes: [],
   },
+  phrases: {},
   // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
   isShowSinger: true,
   sequencerZoomX: 0.5,
@@ -332,7 +324,7 @@ export const singingStoreState: SingingStoreState = {
   startRenderingRequested: false,
   stopRenderingRequested: false,
   nowRendering: false,
-  exportingAudio: false,
+  nowAudioExporting: false,
   cancellationOfAudioExportRequested: false,
 };
 
@@ -679,6 +671,39 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_PHRASE: {
+    mutation(
+      state,
+      { phraseKey, phrase }: { phraseKey: string; phrase: Phrase }
+    ) {
+      state.phrases[phraseKey] = phrase;
+    },
+  },
+
+  DELETE_PHRASE: {
+    mutation(state, { phraseKey }: { phraseKey: string }) {
+      delete state.phrases[phraseKey];
+    },
+  },
+
+  SET_AUDIO_QUERY_TO_PHRASE: {
+    mutation(
+      state,
+      { phraseKey, audioQuery }: { phraseKey: string; audioQuery: AudioQuery }
+    ) {
+      state.phrases[phraseKey].query = audioQuery;
+    },
+  },
+
+  SET_START_TIME_TO_PHRASE: {
+    mutation(
+      state,
+      { phraseKey, startTime }: { phraseKey: string; startTime: number }
+    ) {
+      state.phrases[phraseKey].startTime = startTime;
+    },
+  },
+
   SET_SNAP_TYPE: {
     mutation(state, { snapType }) {
       state.sequencerSnapType = snapType;
@@ -1077,7 +1102,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         return query;
       };
 
-      const calculateStartTime = (score: Score, query: AudioQuery) => {
+      const calcStartTime = (score: Score, query: AudioQuery) => {
         const firstMora = query.accentPhrases[0].moras[0];
         let startTime = tickToSecond(
           score.notes[0].position,
@@ -1133,8 +1158,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         const foundPhrases = await searchPhrases(singer, score);
         for (const [hash, phrase] of foundPhrases) {
-          if (!allPhrases.has(hash)) {
-            allPhrases.set(hash, phrase);
+          const key = hash;
+          if (!state.phrases[key]) {
+            commit("SET_PHRASE", { phraseKey: key, phrase });
+
             // フレーズ追加時の処理
             const noteEvents = generateNoteEvents(
               phrase.score.notes,
@@ -1149,21 +1176,28 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               noteEvents,
             };
             transportRef.addSequence(noteSequence);
-
-            phrase.source = polySynth;
-            phrase.sequence = noteSequence;
+            phraseDataMap.set(key, {
+              source: polySynth,
+              sequence: noteSequence,
+            });
           }
         }
-        for (const [hash, phrase] of allPhrases) {
-          if (!foundPhrases.has(hash)) {
-            allPhrases.delete(hash);
+        for (const key of Object.keys(state.phrases)) {
+          if (!foundPhrases.has(key)) {
+            commit("DELETE_PHRASE", { phraseKey: key });
+
             // フレーズ削除時の処理
-            if (phrase.source) {
-              phrase.source.output.disconnect();
+            const phraseData = phraseDataMap.get(key);
+            if (!phraseData) {
+              throw new Error("phraseData is undefined");
+            }
+            if (phraseData.source) {
+              phraseData.source.output.disconnect();
             }
-            if (phrase.sequence) {
-              transportRef.removeSequence(phrase.sequence);
+            if (phraseData.sequence) {
+              transportRef.removeSequence(phraseData.sequence);
             }
+            phraseDataMap.delete(key);
           }
         }
 
@@ -1173,20 +1207,25 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return;
         }
 
-        for (const phrase of allPhrases.values()) {
+        for (const [key, phrase] of Object.entries(state.phrases)) {
           if (!phrase.singer) {
             continue;
           }
 
-          // Phrase -> AudioQuery
+          // Singer & Score -> AudioQuery
+          // Score & AudioQuery -> StartTime
 
           if (!phrase.query) {
             window.electron.logInfo(`Generating query...`);
 
-            phrase.query = await generateAndEditQuery(
+            const audioQuery = await generateAndEditQuery(
               phrase.singer,
               phrase.score
             );
+            commit("SET_AUDIO_QUERY_TO_PHRASE", { phraseKey: key, audioQuery });
+
+            const startTime = calcStartTime(phrase.score, audioQuery);
+            commit("SET_START_TIME_TO_PHRASE", { phraseKey: key, startTime });
 
             window.electron.logInfo(`Query generated.`);
           }
@@ -1196,38 +1235,43 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           }
 
           // AudioQuery -> Blob
-          // Phrase & AudioQuery -> startTime
+          // Blob & StartTime -> AudioSequence
 
-          const queryHash = await generateAudioQueryHash(phrase.query);
-          // クエリが変更されていたら再合成
-          if (queryHash !== phrase.queryHash) {
-            phrase.blob = phraseAudioBlobCache.get(queryHash);
-            if (phrase.blob) {
+          const phraseData = phraseDataMap.get(key);
+          if (!phraseData) {
+            throw new Error("phraseData is undefined");
+          }
+          if (!phrase.query) {
+            throw new Error("query is undefined.");
+          }
+          if (phrase.startTime === undefined) {
+            throw new Error("startTime is undefined.");
+          }
+          if (!phraseData.blob) {
+            phraseData.blob = phraseAudioBlobCache.get(key);
+            if (phraseData.blob) {
               window.electron.logInfo(`Loaded audio buffer from cache.`);
             } else {
               window.electron.logInfo(`Synthesizing...`);
 
-              phrase.blob = await synthesize(phrase.singer, phrase.query);
-              phraseAudioBlobCache.set(queryHash, phrase.blob);
+              phraseData.blob = await synthesize(phrase.singer, phrase.query);
+              phraseAudioBlobCache.set(key, phraseData.blob);
 
               window.electron.logInfo(`Synthesized.`);
             }
-            phrase.queryHash = queryHash;
-            phrase.startTime = calculateStartTime(phrase.score, phrase.query);
 
             // 音源とシーケンスを作成し直して、再接続する
-            if (phrase.source) {
-              phrase.source.output.disconnect();
+            if (phraseData.source) {
+              phraseData.source.output.disconnect();
             }
-            if (phrase.sequence) {
-              transportRef.removeSequence(phrase.sequence);
+            if (phraseData.sequence) {
+              transportRef.removeSequence(phraseData.sequence);
             }
-
             const audioPlayer = new AudioPlayer(audioContextRef);
             const audioEvents = await generateAudioEvents(
               audioContextRef,
               phrase.startTime,
-              phrase.blob
+              phraseData.blob
             );
             const audioSequence: AudioSequence = {
               type: "audio",
@@ -1236,9 +1280,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             };
             audioPlayer.output.connect(channelStripRef.input);
             transportRef.addSequence(audioSequence);
-
-            phrase.source = audioPlayer;
-            phrase.sequence = audioSequence;
+            phraseData.source = audioPlayer;
+            phraseData.sequence = audioSequence;
           }
 
           if (startRenderingRequested() || stopRenderingRequested()) {
@@ -1780,9 +1823,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     ),
   },
 
-  SET_EXPORTING_AUDIO: {
-    mutation(state, { exportingAudio }) {
-      state.exportingAudio = exportingAudio;
+  SET_NOW_AUDIO_EXPORTING: {
+    mutation(state, { nowAudioExporting }) {
+      state.nowAudioExporting = nowAudioExporting;
     },
   },
 
@@ -1940,39 +1983,31 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             : undefined;
           const clipper = new Clipper(offlineAudioContext);
 
-          for (const phrase of allPhrases.values()) {
-            // TODO: この辺りの処理を共通化する
-            if (phrase.startTime !== undefined && phrase.blob) {
-              // レンダリング済みのフレーズの場合
-              const audioEvents = await generateAudioEvents(
-                offlineAudioContext,
-                phrase.startTime,
-                phrase.blob
-              );
-              const audioPlayer = new AudioPlayer(offlineAudioContext);
-              audioPlayer.output.connect(channelStrip.input);
-              const audioSequence: AudioSequence = {
-                type: "audio",
-                audioPlayer,
-                audioEvents,
-              };
-              offlineTransport.addSequence(audioSequence);
-            } else {
-              // レンダリング未完了のフレーズの場合
-              const noteEvents = generateNoteEvents(
-                phrase.score.notes,
-                phrase.score.tempos,
-                phrase.score.tpqn
-              );
-              const polySynth = new PolySynth(offlineAudioContext);
-              polySynth.output.connect(channelStrip.input);
-              const noteSequence: NoteSequence = {
-                type: "note",
-                instrument: polySynth,
-                noteEvents,
-              };
-              offlineTransport.addSequence(noteSequence);
+          for (const [key, phrase] of Object.entries(state.phrases)) {
+            const phraseData = phraseDataMap.get(key);
+            if (!phraseData) {
+              throw new Error("phraseData is undefined");
+            }
+            if (phrase.startTime === undefined) {
+              throw new Error("startTime is undefined");
+            }
+            if (!phraseData.blob) {
+              throw new Error("blob is undefined");
             }
+            // TODO: この辺りの処理を共通化する
+            const audioEvents = await generateAudioEvents(
+              offlineAudioContext,
+              phrase.startTime,
+              phraseData.blob
+            );
+            const audioPlayer = new AudioPlayer(offlineAudioContext);
+            audioPlayer.output.connect(channelStrip.input);
+            const audioSequence: AudioSequence = {
+              type: "audio",
+              audioPlayer,
+              audioEvents,
+            };
+            offlineTransport.addSequence(audioSequence);
           }
           channelStrip.volume = 1;
           if (limiter) {
@@ -2017,12 +2052,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return { result: "SUCCESS", path: filePath };
         };
 
-        commit("SET_EXPORTING_AUDIO", { exportingAudio: true });
+        commit("SET_NOW_AUDIO_EXPORTING", { nowAudioExporting: true });
         return exportWaveFile().finally(() => {
           commit("SET_CANCELLATION_OF_AUDIO_EXPORT_REQUESTED", {
             cancellationOfAudioExportRequested: false,
           });
-          commit("SET_EXPORTING_AUDIO", { exportingAudio: false });
+          commit("SET_NOW_AUDIO_EXPORTING", { nowAudioExporting: false });
         });
       }
     ),
@@ -2030,8 +2065,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   CANCEL_AUDIO_EXPORT: {
     async action({ state, commit, dispatch }) {
-      if (!state.exportingAudio) {
-        dispatch("LOG_WARN", "CANCEL_AUDIO_EXPORT on !exportingAudio");
+      if (!state.nowAudioExporting) {
+        dispatch("LOG_WARN", "CANCEL_AUDIO_EXPORT on !nowAudioExporting");
         return;
       }
       commit("SET_CANCELLATION_OF_AUDIO_EXPORT_REQUESTED", {
diff --git a/src/store/type.ts b/src/store/type.ts
index 35f5657025..ad598874d8 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -745,9 +745,17 @@ export type Singer = {
   styleId: StyleId;
 };
 
+export type Phrase = {
+  singer?: Singer;
+  score: Score;
+  query?: AudioQuery;
+  startTime?: number;
+};
+
 export type SingingStoreState = {
   singer?: Singer;
   score: Score;
+  phrases: Record<string, Phrase>;
   // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
   isShowSinger: boolean;
   // NOTE: オーディオ再生はボイスと同様もしくは拡張して使う？
@@ -764,7 +772,7 @@ export type SingingStoreState = {
   startRenderingRequested: boolean;
   stopRenderingRequested: boolean;
   nowRendering: boolean;
-  exportingAudio: boolean;
+  nowAudioExporting: boolean;
   cancellationOfAudioExportRequested: boolean;
 };
 
@@ -839,6 +847,22 @@ export type SingingStoreTypes = {
     action(): void;
   };
 
+  SET_PHRASE: {
+    mutation: { phraseKey: string; phrase: Phrase };
+  };
+
+  DELETE_PHRASE: {
+    mutation: { phraseKey: string };
+  };
+
+  SET_AUDIO_QUERY_TO_PHRASE: {
+    mutation: { phraseKey: string; audioQuery: AudioQuery };
+  };
+
+  SET_START_TIME_TO_PHRASE: {
+    mutation: { phraseKey: string; startTime: number };
+  };
+
   SET_SNAP_TYPE: {
     mutation: { snapType: number };
     action(payload: { snapType: number }): void;
@@ -956,8 +980,8 @@ export type SingingStoreTypes = {
     mutation: { nowRendering: boolean };
   };
 
-  SET_EXPORTING_AUDIO: {
-    mutation: { exportingAudio: boolean };
+  SET_NOW_AUDIO_EXPORTING: {
+    mutation: { nowAudioExporting: boolean };
   };
 
   SET_CANCELLATION_OF_AUDIO_EXPORT_REQUESTED: {
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index df6ca2e390..000aa99bf0 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -3,7 +3,7 @@
   <menu-bar />
   <tool-bar />
   <div class="sing-main">
-    <div v-if="exportingAudio" class="exporting-dialog">
+    <div v-if="nowAudioExporting" class="exporting-dialog">
       <div>
         <q-spinner color="primary" size="2.5rem" />
         <div class="q-mt-xs">
@@ -67,8 +67,8 @@ export default defineComponent({
     const nowRendering = computed(() => {
       return store.state.nowRendering;
     });
-    const exportingAudio = computed(() => {
-      return store.state.exportingAudio;
+    const nowAudioExporting = computed(() => {
+      return store.state.nowAudioExporting;
     });
 
     const cancelExport = () => {
@@ -111,7 +111,7 @@ export default defineComponent({
 
     return {
       nowRendering,
-      exportingAudio,
+      nowAudioExporting,
       cancelExport,
     };
   },
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index ad776bbd32..940c2065f3 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -165,6 +165,7 @@ describe("store/vuex.js test", () => {
           ],
           notes: [],
         },
+        phrases: {},
         isShowSinger: true,
         sequencerZoomX: 1,
         sequencerZoomY: 1,
@@ -179,7 +180,7 @@ describe("store/vuex.js test", () => {
         startRenderingRequested: false,
         stopRenderingRequested: false,
         nowRendering: false,
-        exportingAudio: false,
+        nowAudioExporting: false,
         cancellationOfAudioExportRequested: false,
       },
       getters: {

From 14839407dc5f21df3816fe8afdffaeac1cd8e0ce Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 11 Dec 2023 23:58:15 +0900
Subject: [PATCH 35/59] =?UTF-8?q?[project-s]=20=E3=83=AC=E3=83=B3=E3=83=80?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=B0=E4=B8=AD=E3=81=AE=E7=AF=84=E5=9B=B2?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1668)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue        | 100 ++++++++++++----
 .../Sing/SequencerPhraseIndicator.vue         |  82 +++++++++++++
 src/store/singing.ts                          | 112 +++++++++++++-----
 src/store/type.ts                             |  13 ++
 4 files changed, 258 insertions(+), 49 deletions(-)
 create mode 100644 src/components/Sing/SequencerPhraseIndicator.vue

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index d7dc06e4eb..8b81bc317a 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -1,11 +1,19 @@
 <template>
   <div class="score-sequencer">
     <!-- 左上の角 -->
-    <div class="corner"></div>
+    <div class="sequencer-corner"></div>
     <!-- ルーラー -->
-    <sequencer-ruler :offset="scrollX" :num-of-measures="numOfMeasures" />
+    <sequencer-ruler
+      class="sequencer-ruler"
+      :offset="scrollX"
+      :num-of-measures="numOfMeasures"
+    />
     <!-- 鍵盤 -->
-    <sequencer-keys :offset="scrollY" :black-key-width="30" />
+    <sequencer-keys
+      class="sequencer-keys"
+      :offset="scrollY"
+      :black-key-width="30"
+    />
     <!-- シーケンサ -->
     <div
       ref="sequencerBody"
@@ -95,20 +103,30 @@
         @handleDragRightStart="handleDragRightStart"
         @handleDragLeftStart="handleDragLeftStart"
       />
+    </div>
+    <div
+      class="sequencer-overlay"
+      :style="{
+        marginRight: `${scrollBarWidth}px`,
+        marginBottom: `${scrollBarWidth}px`,
+      }"
+    >
+      <sequencer-phrase-indicator
+        v-for="phraseInfo in phraseInfos"
+        :key="phraseInfo.key"
+        :phrase-key="phraseInfo.key"
+        class="sequencer-phrase-indicator"
+        :style="{
+          width: `${phraseInfo.width}px`,
+          transform: `translateX(${phraseInfo.x - scrollX}px)`,
+        }"
+      />
       <div
-        class="sequencer-body-playhead-wrapper"
+        class="sequencer-playhead"
         :style="{
-          width: `${gridWidth}px`,
-          height: `${gridHeight}px`,
+          transform: `translateX(${playheadX - scrollX}px)`,
         }"
-      >
-        <div
-          class="sequencer-body-playhead"
-          :style="{
-            transform: `translateX(${playheadX}px)`,
-          }"
-        ></div>
-      </div>
+      ></div>
     </div>
     <!-- NOTE: スクロールバー+ズームレンジ仮 -->
     <input
@@ -152,6 +170,7 @@ import { useStore } from "@/store";
 import SequencerRuler from "@/components/Sing/SequencerRuler.vue";
 import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
 import SequencerNote from "@/components/Sing/SequencerNote.vue";
+import SequencerPhraseIndicator from "@/components/Sing/SequencerPhraseIndicator.vue";
 import {
   getMeasureDuration,
   getNoteDuration,
@@ -171,6 +190,7 @@ export default defineComponent({
     SequencerRuler,
     SequencerKeys,
     SequencerNote,
+    SequencerPhraseIndicator,
   },
   setup() {
     const ZOOM_X_MIN = 0.2;
@@ -274,6 +294,16 @@ export default defineComponent({
       return Math.floor(baseX * zoomX.value);
     });
     const selectedNoteIds = computed(() => state.selectedNoteIds);
+    const phraseInfos = computed(() => {
+      return Object.entries(state.phrases).map(([key, phrase]) => {
+        const startBaseX = tickToBaseX(phrase.startTicks, tpqn.value);
+        const endBaseX = tickToBaseX(phrase.endTicks, tpqn.value);
+        const startX = startBaseX * zoomX.value;
+        const endX = endBaseX * zoomX.value;
+        return { key, x: startX, width: endX - startX };
+      });
+    });
+    const scrollBarWidth = ref(12);
 
     const sequencerBody = ref<HTMLElement | null>(null);
 
@@ -719,6 +749,11 @@ export default defineComponent({
       const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
       sequencerBodyElement.scrollTo(0, scrollBaseY * zoomY.value);
 
+      // スクロールバーの幅を取得する
+      const clientWidth = sequencerBodyElement.clientWidth;
+      const offsetWidth = sequencerBodyElement.offsetWidth;
+      scrollBarWidth.value = offsetWidth - clientWidth;
+
       store.dispatch("ADD_PLAYHEAD_POSITION_CHANGE_LISTENER", {
         listener: playheadPositionChangeListener,
       });
@@ -753,6 +788,8 @@ export default defineComponent({
       scrollX,
       scrollY,
       playheadX,
+      phraseInfos,
+      scrollBarWidth,
       sequencerBody,
       setZoomX,
       setZoomY,
@@ -782,13 +819,27 @@ export default defineComponent({
   grid-template-columns: 48px 1fr;
 }
 
-.corner {
+.sequencer-corner {
+  grid-row: 1;
+  grid-column: 1;
   background: #fff;
   border-bottom: 1px solid #ccc;
   border-right: 1px solid #ccc;
 }
 
+.sequencer-ruler {
+  grid-row: 1;
+  grid-column: 2;
+}
+
+.sequencer-keys {
+  grid-row: 2;
+  grid-column: 1;
+}
+
 .sequencer-body {
+  grid-row: 2;
+  grid-column: 2;
   backface-visibility: hidden;
   overflow: auto;
   position: relative;
@@ -798,15 +849,23 @@ export default defineComponent({
   }
 }
 
-.sequencer-body-playhead-wrapper {
-  position: absolute;
-  top: 0;
-  left: 0;
+.sequencer-overlay {
+  grid-row: 2;
+  grid-column: 2;
+  position: relative;
   overflow: hidden;
   pointer-events: none;
 }
 
-.sequencer-body-playhead {
+.sequencer-phrase-indicator {
+  position: absolute;
+  top: -2px;
+  left: 0;
+  height: 6px;
+  border-radius: 2px;
+}
+
+.sequencer-playhead {
   position: absolute;
   top: 0;
   left: -2px;
@@ -815,7 +874,6 @@ export default defineComponent({
   background: colors.$primary;
   border-left: 1px solid rgba(colors.$background-rgb, 0.83);
   border-right: 1px solid rgba(colors.$background-rgb, 0.83);
-  pointer-events: none;
 }
 
 .sequencer-grid {
diff --git a/src/components/Sing/SequencerPhraseIndicator.vue b/src/components/Sing/SequencerPhraseIndicator.vue
new file mode 100644
index 0000000000..9fb3fe290f
--- /dev/null
+++ b/src/components/Sing/SequencerPhraseIndicator.vue
@@ -0,0 +1,82 @@
+<template>
+  <div :class="`${className}`"></div>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from "vue";
+import { useStore } from "@/store";
+import { PhraseState } from "@/store/type";
+
+export default defineComponent({
+  name: "SingSequencerPhraseIndicator",
+  props: {
+    phraseKey: { type: String, required: true },
+  },
+  setup(props) {
+    const store = useStore();
+    const classNames: Record<PhraseState, string> = {
+      WAITING_TO_BE_RENDERED: "waiting-to-be-rendered",
+      NOW_RENDERING: "now-rendering",
+      COULD_NOT_RENDER: "could-not-render",
+      PLAYABLE: "playable",
+    };
+    const className = computed(() => {
+      const phrase = store.state.phrases[props.phraseKey];
+      return classNames[phrase.state];
+    });
+
+    return {
+      className,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+.waiting-to-be-rendered {
+  background-color: colors.$background;
+  background-image: linear-gradient(
+    to right,
+    rgba(colors.$primary-rgb, 0.8),
+    rgba(colors.$primary-rgb, 0.8)
+  );
+}
+
+.now-rendering {
+  border: 1px solid rgba(colors.$primary-rgb, 0.7);
+  background-color: colors.$background;
+  background-size: 28px 28px;
+  background-image: linear-gradient(
+    -45deg,
+    colors.$primary,
+    colors.$primary 25%,
+    rgba(colors.$primary-rgb, 0.36) 25%,
+    rgba(colors.$primary-rgb, 0.36) 50%,
+    colors.$primary 50%,
+    colors.$primary 75%,
+    rgba(colors.$primary-rgb, 0.36) 75%,
+    rgba(colors.$primary-rgb, 0.36) 100%
+  );
+  animation: stripes-animation 0.7s linear infinite;
+}
+
+@keyframes stripes-animation {
+  from {
+    background-position-x: 0;
+  }
+  to {
+    background-position-x: 28px;
+  }
+}
+
+.could-not-render {
+  background-color: #ff6a64;
+}
+
+.playable {
+  visibility: hidden;
+}
+</style>
diff --git a/src/store/singing.ts b/src/store/singing.ts
index d5910dcb83..c8aa966b6e 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -11,6 +11,7 @@ import {
   SaveResultObject,
   Singer,
   Phrase,
+  PhraseState,
 } from "./type";
 import { createPartialStore } from "./vuex";
 import { createUILockAction } from "./ui";
@@ -686,6 +687,18 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_STATE_TO_PHRASE: {
+    mutation(
+      state,
+      {
+        phraseKey,
+        phraseState,
+      }: { phraseKey: string; phraseState: PhraseState }
+    ) {
+      state.phrases[phraseKey].state = phraseState;
+    },
+  },
+
   SET_AUDIO_QUERY_TO_PHRASE: {
     mutation(
       state,
@@ -968,6 +981,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               ...score,
               notes: phraseNotes,
             };
+            const phraseFirstNote = phraseNotes[0];
+            const phraseLastNote = phraseNotes[phraseNotes.length - 1];
             const hash = await generateSingerAndScoreHash({
               singer,
               score: phraseScore, // NOTE: とりあえず拍子も含めてハッシュ生成する
@@ -975,6 +990,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             foundPhrases.set(hash, {
               singer,
               score: phraseScore,
+              startTicks: phraseFirstNote.position,
+              endTicks: phraseLastNote.position + phraseLastNote.duration,
+              state: "WAITING_TO_BE_RENDERED",
             });
 
             phraseNotes = [];
@@ -983,7 +1001,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         return foundPhrases;
       };
 
-      const generateAndEditQuery = async (singer: Singer, score: Score) => {
+      const getSortedPhrasesEntries = (phrases: Record<string, Phrase>) => {
+        return Object.entries(phrases).sort((a, b) => {
+          return a[1].startTicks - b[1].startTicks;
+        });
+      };
+
+      const fetchQuery = async (singer: Singer, score: Score) => {
         if (!getters.IS_ENGINE_READY(singer.engineId)) {
           throw new Error("Engine not ready.");
         }
@@ -997,15 +1021,19 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           .map((value) => value.replace("へ", "ヘ"))
           .join("");
 
-        let query = await dispatch("FETCH_AUDIO_QUERY", {
+        const query = await dispatch("FETCH_AUDIO_QUERY", {
           text,
           engineId: singer.engineId,
           styleId: singer.styleId,
         });
+        return query;
+      };
 
-        const moras = query.accentPhrases.map((value) => value.moras).flat();
+      const getMoras = (query: AudioQuery) => {
+        return query.accentPhrases.map((value) => value.moras).flat();
+      };
 
-        // 音素を表示
+      const logPhonemes = (moras: Mora[]) => {
         const phonemes = moras
           .map((value) => {
             if (value.consonant === undefined) {
@@ -1017,14 +1045,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           .flat()
           .join(" ");
         window.electron.logInfo(`  phonemes: ${phonemes}`);
+      };
 
-        if (moras.length !== score.notes.length) {
-          throw new Error(
-            "The number of moras and the number of notes do not match."
-          );
-        }
-
-        // クエリを編集
+      const editQuery = (score: Score, query: AudioQuery) => {
         let noteIndex = 0;
         for (let i = 0; i < query.accentPhrases.length; i++) {
           const accentPhrase = query.accentPhrases[i];
@@ -1091,15 +1114,19 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             noteIndex++;
           }
         }
+      };
 
-        // ピッチを更新
-        query = await dispatch("UPDATE_PERIODIC_PITCH", {
+      const updatePeriodicPitch = async (singer: Singer, query: AudioQuery) => {
+        if (!getters.IS_ENGINE_READY(singer.engineId)) {
+          throw new Error("Engine not ready.");
+        }
+
+        const newQuery = await dispatch("UPDATE_PERIODIC_PITCH", {
           audioQuery: query,
           engineId: singer.engineId,
           styleId: singer.styleId,
         });
-
-        return query;
+        return newQuery;
       };
 
       const calcStartTime = (score: Score, query: AudioQuery) => {
@@ -1159,7 +1186,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         const foundPhrases = await searchPhrases(singer, score);
         for (const [hash, phrase] of foundPhrases) {
           const key = hash;
-          if (!state.phrases[key]) {
+          if (!Object.hasOwn(state.phrases, key)) {
             commit("SET_PHRASE", { phraseKey: key, phrase });
 
             // フレーズ追加時の処理
@@ -1207,30 +1234,51 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return;
         }
 
-        for (const [key, phrase] of Object.entries(state.phrases)) {
+        for (const [key, phrase] of getSortedPhrasesEntries(state.phrases)) {
           if (!phrase.singer) {
             continue;
           }
 
+          if (phrase.state === "WAITING_TO_BE_RENDERED") {
+            commit("SET_STATE_TO_PHRASE", {
+              phraseKey: key,
+              phraseState: "NOW_RENDERING",
+            });
+          }
+
           // Singer & Score -> AudioQuery
           // Score & AudioQuery -> StartTime
 
           if (!phrase.query) {
             window.electron.logInfo(`Generating query...`);
 
-            const audioQuery = await generateAndEditQuery(
-              phrase.singer,
-              phrase.score
-            );
-            commit("SET_AUDIO_QUERY_TO_PHRASE", { phraseKey: key, audioQuery });
-
+            let audioQuery = await fetchQuery(phrase.singer, phrase.score);
+            const moras = getMoras(audioQuery);
+            logPhonemes(moras);
+            if (moras.length !== phrase.score.notes.length) {
+              commit("SET_STATE_TO_PHRASE", {
+                phraseKey: key,
+                phraseState: "COULD_NOT_RENDER",
+              });
+              continue;
+            }
+            editQuery(phrase.score, audioQuery);
+            audioQuery = await updatePeriodicPitch(phrase.singer, audioQuery);
             const startTime = calcStartTime(phrase.score, audioQuery);
+
+            commit("SET_AUDIO_QUERY_TO_PHRASE", { phraseKey: key, audioQuery });
             commit("SET_START_TIME_TO_PHRASE", { phraseKey: key, startTime });
 
             window.electron.logInfo(`Query generated.`);
           }
 
           if (startRenderingRequested() || stopRenderingRequested()) {
+            if (phrase.state === "NOW_RENDERING") {
+              commit("SET_STATE_TO_PHRASE", {
+                phraseKey: key,
+                phraseState: "WAITING_TO_BE_RENDERED",
+              });
+            }
             return;
           }
 
@@ -1284,6 +1332,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             phraseData.sequence = audioSequence;
           }
 
+          if (phrase.state === "NOW_RENDERING") {
+            commit("SET_STATE_TO_PHRASE", {
+              phraseKey: key,
+              phraseState: "PLAYABLE",
+            });
+          }
+
           if (startRenderingRequested() || stopRenderingRequested()) {
             return;
           }
@@ -1988,11 +2043,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             if (!phraseData) {
               throw new Error("phraseData is undefined");
             }
-            if (phrase.startTime === undefined) {
-              throw new Error("startTime is undefined");
-            }
-            if (!phraseData.blob) {
-              throw new Error("blob is undefined");
+            if (
+              !phraseData.blob ||
+              phrase.startTime === undefined ||
+              phrase.state !== "PLAYABLE"
+            ) {
+              continue;
             }
             // TODO: この辺りの処理を共通化する
             const audioEvents = await generateAudioEvents(
diff --git a/src/store/type.ts b/src/store/type.ts
index ad598874d8..b2a6deef02 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -745,9 +745,18 @@ export type Singer = {
   styleId: StyleId;
 };
 
+export type PhraseState =
+  | "WAITING_TO_BE_RENDERED"
+  | "NOW_RENDERING"
+  | "COULD_NOT_RENDER"
+  | "PLAYABLE";
+
 export type Phrase = {
   singer?: Singer;
   score: Score;
+  startTicks: number;
+  endTicks: number;
+  state: PhraseState;
   query?: AudioQuery;
   startTime?: number;
 };
@@ -855,6 +864,10 @@ export type SingingStoreTypes = {
     mutation: { phraseKey: string };
   };
 
+  SET_STATE_TO_PHRASE: {
+    mutation: { phraseKey: string; phraseState: PhraseState };
+  };
+
   SET_AUDIO_QUERY_TO_PHRASE: {
     mutation: { phraseKey: string; audioQuery: AudioQuery };
   };

From 1331abb5ea9477352f17ed2badd29ffd0a50b7af Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 14 Dec 2023 05:33:15 +0900
Subject: [PATCH 36/59] =?UTF-8?q?[project-s]=20=E3=83=95=E3=82=A3=E3=83=AB?=
 =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=81=A8=E3=82=AA?=
 =?UTF-8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E5=91=A8=E3=82=8A=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#1670)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/infrastructures/AudioRenderer.ts | 173 +++++++++++++++------------
 src/views/SingerHome.vue             |   2 +-
 2 files changed, 99 insertions(+), 76 deletions(-)

diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 26076fd250..0985f44764 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -582,12 +582,11 @@ class AudioPlayerVoice {
 }
 
 export type AudioPlayerOptions = {
-  readonly volume: number;
+  readonly volume?: number;
 };
 
 /**
  * 同時に複数の音声を再生することが可能なプレイヤーです。
- * ボイス（AudioPlayerVoice）の作成・管理を行います。
  */
 export class AudioPlayer {
   private readonly audioContext: BaseAudioContext;
@@ -599,14 +598,11 @@ export class AudioPlayer {
     return this.gainNode;
   }
 
-  constructor(
-    audioContext: BaseAudioContext,
-    options: AudioPlayerOptions = { volume: 1.0 }
-  ) {
+  constructor(audioContext: BaseAudioContext, options?: AudioPlayerOptions) {
     this.audioContext = audioContext;
 
     this.gainNode = new GainNode(audioContext);
-    this.gainNode.gain.value = options.volume;
+    this.gainNode.gain.value = options?.volume ?? 1.0;
   }
 
   /**
@@ -639,7 +635,17 @@ export class AudioPlayer {
   }
 }
 
-export type Envelope = {
+export type SynthOscParams = {
+  readonly type: OscillatorType;
+};
+
+export type SynthFilterParams = {
+  readonly cutoff: number;
+  readonly resonance: number;
+  readonly keyTrack: number;
+};
+
+export type SynthAmpParams = {
   readonly attack: number;
   readonly decay: number;
   readonly sustain: number;
@@ -648,8 +654,9 @@ export type Envelope = {
 
 type SynthVoiceParams = {
   readonly noteNumber: number;
-  readonly oscillatorType: OscillatorType;
-  readonly envelope: Envelope;
+  readonly osc: SynthOscParams;
+  readonly filter: SynthFilterParams;
+  readonly amp: SynthAmpParams;
 };
 
 /**
@@ -657,9 +664,10 @@ type SynthVoiceParams = {
  */
 class SynthVoice {
   readonly noteNumber: number;
-  private readonly oscillatorNode: OscillatorNode;
+  private readonly oscNode: OscillatorNode;
   private readonly gainNode: GainNode;
-  private readonly envelope: Envelope;
+  private readonly filterNode: BiquadFilterNode;
+  private readonly ampParams: SynthAmpParams;
 
   private _isActive = false;
   private _isStopped = false;
@@ -679,24 +687,43 @@ class SynthVoice {
 
   constructor(audioContext: BaseAudioContext, params: SynthVoiceParams) {
     this.noteNumber = params.noteNumber;
-    this.envelope = params.envelope;
+    this.ampParams = params.amp;
 
-    this.oscillatorNode = new OscillatorNode(audioContext);
-    this.oscillatorNode.onended = () => {
+    this.oscNode = new OscillatorNode(audioContext);
+    this.oscNode.type = params.osc.type;
+    this.oscNode.onended = () => {
       this._isStopped = true;
     };
+    this.filterNode = new BiquadFilterNode(audioContext);
+    this.filterNode.type = "lowpass";
+    this.filterNode.frequency.value = this.calcFilterFreq(
+      params.filter.cutoff,
+      params.filter.keyTrack,
+      params.noteNumber
+    );
+    this.filterNode.Q.value = this.calcFilterQ(params.filter.resonance);
     this.gainNode = new GainNode(audioContext);
-    this.oscillatorNode.type = params.oscillatorType;
-    this.oscillatorNode.connect(this.gainNode);
+    this.oscNode.connect(this.filterNode);
+    this.filterNode.connect(this.gainNode);
   }
 
-  /**
-   * MIDIノート番号を周波数に変換します。
-   * @param noteNumber MIDIノート番号
-   * @returns 周波数（Hz）
-   */
-  private midiToFrequency(noteNumber: number) {
-    return 440 * 2 ** ((noteNumber - 69) / 12);
+  private noteNumberToFrequency(noteNumber: number) {
+    return 440 * Math.pow(2, (noteNumber - 69) / 12);
+  }
+
+  private linearToDecibel(linearValue: number) {
+    if (linearValue === 0) {
+      return -1000;
+    }
+    return 20 * Math.log10(linearValue);
+  }
+
+  private calcFilterFreq(cutoff: number, keyTrack: number, noteNumber: number) {
+    return cutoff * Math.pow(2, ((noteNumber - 60) * keyTrack) / 12);
+  }
+
+  private calcFilterQ(resonance: number) {
+    return this.linearToDecibel(Math.SQRT1_2) + resonance;
   }
 
   /**
@@ -705,20 +732,20 @@ class SynthVoice {
    */
   noteOn(contextTime: number) {
     const t0 = contextTime;
-    const atk = this.envelope.attack;
-    const dcy = this.envelope.decay;
-    const sus = this.envelope.sustain;
+    const atk = this.ampParams.attack;
+    const dcy = this.ampParams.decay;
+    const sus = this.ampParams.sustain;
 
-    // エンベロープ（アタック、ディケイ、サスティーン）のスケジュールを行う
+    // アタック、ディケイ、サスティーンのスケジュールを行う
     this.gainNode.gain.value = 0;
     this.gainNode.gain.setValueAtTime(0, t0);
     this.gainNode.gain.linearRampToValueAtTime(1, t0 + atk);
     this.gainNode.gain.setTargetAtTime(sus, t0 + atk, dcy);
 
-    const freq = this.midiToFrequency(this.noteNumber);
-    this.oscillatorNode.frequency.value = freq;
+    const freq = this.noteNumberToFrequency(this.noteNumber);
+    this.oscNode.frequency.value = freq;
 
-    this.oscillatorNode.start(contextTime);
+    this.oscNode.start(contextTime);
     this._isActive = true;
   }
 
@@ -731,18 +758,18 @@ class SynthVoice {
    */
   noteOff(contextTime: number) {
     const t0 = contextTime;
-    const rel = this.envelope.release;
+    const rel = this.ampParams.release;
     const stopContextTime = t0 + rel * 4;
 
     if (
       this.stopContextTime === undefined ||
       stopContextTime < this.stopContextTime
     ) {
-      // エンベロープ（リリース）のスケジュールを行う
+      // リリースのスケジュールを行う
       this.gainNode.gain.cancelAndHoldAtTime(t0);
       this.gainNode.gain.setTargetAtTime(0, t0, rel);
 
-      this.oscillatorNode.stop(stopContextTime);
+      this.oscNode.stop(stopContextTime);
       this._isActive = false;
 
       this.stopContextTime = stopContextTime;
@@ -751,20 +778,21 @@ class SynthVoice {
 }
 
 export type PolySynthOptions = {
-  readonly volume: number;
-  readonly oscillatorType: OscillatorType;
-  readonly envelope: Envelope;
+  readonly volume?: number;
+  readonly osc?: SynthOscParams;
+  readonly filter?: SynthFilterParams;
+  readonly amp?: SynthAmpParams;
 };
 
 /**
- * エンベロープの設定が可能なポリフォニックシンセサイザーです。
- * ボイス（SynthVoice）の作成・管理を行います。
+ * ポリフォニックシンセサイザーです。
  */
 export class PolySynth implements Instrument {
   private readonly audioContext: BaseAudioContext;
   private readonly gainNode: GainNode;
-  private readonly oscillatorType: OscillatorType;
-  private readonly envelope: Envelope;
+  private readonly oscParams: SynthOscParams;
+  private readonly filterParams: SynthFilterParams;
+  private readonly ampParams: SynthAmpParams;
 
   private voices: SynthVoice[] = [];
 
@@ -772,25 +800,25 @@ export class PolySynth implements Instrument {
     return this.gainNode;
   }
 
-  constructor(
-    audioContext: BaseAudioContext,
-    options: PolySynthOptions = {
-      volume: 0.1,
-      oscillatorType: "square",
-      envelope: {
-        attack: 0.001,
-        decay: 0.1,
-        sustain: 0.7,
-        release: 0.02,
-      },
-    }
-  ) {
+  constructor(audioContext: BaseAudioContext, options?: PolySynthOptions) {
     this.audioContext = audioContext;
+    this.oscParams = options?.osc ?? {
+      type: "square",
+    };
+    this.filterParams = options?.filter ?? {
+      cutoff: 3300,
+      resonance: 0,
+      keyTrack: 0.25,
+    };
+    this.ampParams = options?.amp ?? {
+      attack: 0.001,
+      decay: 0.18,
+      sustain: 0.3,
+      release: 0.02,
+    };
 
-    this.oscillatorType = options.oscillatorType;
-    this.envelope = options.envelope;
     this.gainNode = new GainNode(this.audioContext);
-    this.gainNode.gain.value = options.volume;
+    this.gainNode.gain.value = options?.volume ?? 0.13;
   }
 
   /**
@@ -807,8 +835,9 @@ export class PolySynth implements Instrument {
 
     const voice = new SynthVoice(this.audioContext, {
       noteNumber,
-      oscillatorType: this.oscillatorType,
-      envelope: this.envelope,
+      osc: this.oscParams,
+      filter: this.filterParams,
+      amp: this.ampParams,
     });
     this.voices = this.voices.filter((value) => {
       return !value.isStopped;
@@ -848,7 +877,7 @@ export class PolySynth implements Instrument {
 }
 
 export type ChannelStripOptions = {
-  readonly volume: number;
+  readonly volume?: number;
 };
 
 /**
@@ -872,19 +901,16 @@ export class ChannelStrip {
     this.gainNode.gain.value = value;
   }
 
-  constructor(
-    audioContext: BaseAudioContext,
-    options: ChannelStripOptions = { volume: 0.1 }
-  ) {
+  constructor(audioContext: BaseAudioContext, options?: ChannelStripOptions) {
     this.gainNode = new GainNode(audioContext);
-    this.gainNode.gain.value = options.volume;
+    this.gainNode.gain.value = options?.volume ?? 0.1;
   }
 }
 
 export type LimiterOptions = {
-  readonly inputGain: number;
-  readonly outputGain: number;
-  readonly release: number;
+  readonly inputGain?: number;
+  readonly outputGain?: number;
+  readonly release?: number;
 };
 
 /**
@@ -935,10 +961,7 @@ export class Limiter {
     return this.compNode.reduction;
   }
 
-  constructor(
-    audioContext: BaseAudioContext,
-    options: LimiterOptions = { inputGain: 0, outputGain: 0, release: 0.25 }
-  ) {
+  constructor(audioContext: BaseAudioContext, options?: LimiterOptions) {
     this.inputGainNode = new GainNode(audioContext);
     this.compNode = new DynamicsCompressorNode(audioContext);
     this.correctionGainNode = new GainNode(audioContext);
@@ -949,13 +972,13 @@ export class Limiter {
     this.compNode.ratio.value = 20; // クリッピングが起こらないように、高いレシオ（1/20）で圧縮する
     this.compNode.knee.value = 8; // 自然にかかってほしいという気持ちで8に設定（リミッターなので0でも良いかも）
     this.compNode.attack.value = 0; // クリッピングが起こらないように、すぐに圧縮を開始する
-    this.compNode.release.value = options.release; // 歪まないように少し遅めに設定
+    this.compNode.release.value = options?.release ?? 0.25; // 歪まないように少し遅めに設定
 
     // メイクアップゲインで上がった分を下げる（圧縮していないときは元の音量で出力）
     this.correctionGainNode.gain.value = 0.85;
 
-    this.setGainInDecibels(options.inputGain, this.inputGainNode);
-    this.setGainInDecibels(options.outputGain, this.outputGainNode);
+    this.setGainInDecibels(options?.inputGain ?? 0, this.inputGainNode);
+    this.setGainInDecibels(options?.outputGain ?? 0, this.outputGainNode);
 
     this.inputGainNode.connect(this.compNode);
     this.compNode.connect(this.correctionGainNode);
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index 000aa99bf0..a12f7ae4a1 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -98,7 +98,7 @@ export default defineComponent({
       });
       await store.dispatch("SET_SINGER", {});
 
-      await store.dispatch("SET_VOLUME", { volume: 0.3 });
+      await store.dispatch("SET_VOLUME", { volume: 0.6 });
       await store.dispatch("SET_PLAYHEAD_POSITION", { position: 0 });
       await store.dispatch("SET_LEFT_LOCATOR_POSITION", {
         position: 0,

From e3b7847f6dc85131be26312b56ba266350916de2 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 17 Dec 2023 07:00:28 +0900
Subject: [PATCH 37/59] =?UTF-8?q?[project-s]=20=E9=8D=B5=E7=9B=A4=E3=82=AF?=
 =?UTF-8?q?=E3=83=AA=E3=83=83=E3=82=AF=E6=99=82=E3=81=A8=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E7=B7=A8=E9=9B=86=E6=99=82=E3=81=AB=E9=9F=B3=E3=82=92?=
 =?UTF-8?q?=E9=B3=B4=E3=82=89=E3=81=99=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=20(#1671)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sing/ScoreSequencer.vue |  56 +++++++++--
 src/components/Sing/SequencerKeys.vue  | 133 +++++++++++++++++--------
 src/components/Sing/SequencerNote.vue  |  31 +++---
 src/helpers/singHelper.ts              |   8 ++
 src/infrastructures/AudioRenderer.ts   |  31 ++++--
 src/store/singing.ts                   |  34 +++++++
 src/store/type.ts                      |   8 ++
 7 files changed, 230 insertions(+), 71 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 8b81bc317a..326181e726 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -12,7 +12,7 @@
     <sequencer-keys
       class="sequencer-keys"
       :offset="scrollY"
-      :black-key-width="30"
+      :black-key-width="28"
     />
     <!-- シーケンサ -->
     <div
@@ -182,6 +182,13 @@ import {
   keyInfos,
   getDoremiFromNoteNumber,
   getNumOfMeasures,
+  ZOOM_X_MIN,
+  ZOOM_X_MAX,
+  ZOOM_X_STEP,
+  ZOOM_Y_MIN,
+  ZOOM_Y_MAX,
+  ZOOM_Y_STEP,
+  PREVIEW_SOUND_DURATION,
 } from "@/helpers/singHelper";
 
 export default defineComponent({
@@ -193,13 +200,6 @@ export default defineComponent({
     SequencerPhraseIndicator,
   },
   setup() {
-    const ZOOM_X_MIN = 0.2;
-    const ZOOM_X_MAX = 1;
-    const ZOOM_X_STEP = 0.05;
-    const ZOOM_Y_MIN = 0.35;
-    const ZOOM_Y_MAX = 1;
-    const ZOOM_Y_STEP = 0.05;
-
     enum DragMode {
       NONE = "NONE",
       MOVE = "MOVE",
@@ -334,6 +334,10 @@ export default defineComponent({
           lyric,
         },
       });
+      store.dispatch("PLAY_PREVIEW_SOUND", {
+        noteNumber,
+        duration: PREVIEW_SOUND_DURATION,
+      });
     };
 
     // マウスダウン
@@ -359,6 +363,20 @@ export default defineComponent({
       if (dragMode.value !== DragMode.NONE) {
         cancelAnimationFrame(dragId.value);
         dragMode.value = DragMode.NONE;
+
+        if (selectedNoteIds.value.length === 1) {
+          const selectedNoteId = selectedNoteIds.value[0];
+          const selectedNote = state.score.notes.find((value) => {
+            return value.id === selectedNoteId;
+          });
+          if (!selectedNote) {
+            throw new Error("selectedNote is undefined.");
+          }
+          store.dispatch("PLAY_PREVIEW_SOUND", {
+            noteNumber: selectedNote.noteNumber,
+            duration: PREVIEW_SOUND_DURATION,
+          });
+        }
         return;
       }
     };
@@ -582,9 +600,11 @@ export default defineComponent({
 
     // キーボードイベント
     const handleNotesArrowUp = () => {
+      let changedNoteNumber: number | undefined;
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
           const noteNumber = Math.min(note.noteNumber + 1, 127);
+          changedNoteNumber = noteNumber;
           return {
             ...note,
             noteNumber,
@@ -597,12 +617,23 @@ export default defineComponent({
         return;
       }
       store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+      if (
+        changedNoteNumber !== undefined &&
+        selectedNoteIds.value.length === 1
+      ) {
+        store.dispatch("PLAY_PREVIEW_SOUND", {
+          noteNumber: changedNoteNumber,
+          duration: PREVIEW_SOUND_DURATION,
+        });
+      }
     };
 
     const handleNotesArrowDown = () => {
+      let changedNoteNumber: number | undefined;
       const newNotes = state.score.notes.map((note) => {
         if (selectedNoteIds.value.includes(note.id)) {
           const noteNumber = Math.max(note.noteNumber - 1, 0);
+          changedNoteNumber = noteNumber;
           return {
             ...note,
             noteNumber,
@@ -615,6 +646,15 @@ export default defineComponent({
         return;
       }
       store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+      if (
+        changedNoteNumber !== undefined &&
+        selectedNoteIds.value.length === 1
+      ) {
+        store.dispatch("PLAY_PREVIEW_SOUND", {
+          noteNumber: changedNoteNumber,
+          duration: PREVIEW_SOUND_DURATION,
+        });
+      }
     };
 
     const handleNotesArrowRight = () => {
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index d61dd2e787..991862c3a9 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -1,45 +1,52 @@
 <template>
   <div ref="sequencerKeys" class="sequencer-keys">
     <svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height">
-      <defs>
-        <symbol id="white-keys">
-          <g v-for="(whiteKeyInfo, index) in whiteKeyInfos" :key="index">
-            <rect
-              :x="whiteKeyRects[index].x - 0.5"
-              :y="whiteKeyRects[index].y + 0.5"
-              :width="whiteKeyRects[index].width"
-              :height="whiteKeyRects[index].height"
-              class="sequencer-keys-item-white"
-              :title="whiteKeyInfo.name"
-            />
-            <text
-              v-if="whiteKeyInfo.pitch === 'C'"
-              font-size="10"
-              :x="blackKeyWidth + 2"
-              :y="whiteKeyRects[index].y + whiteKeyRects[index].height - 4"
-              class="sequencer-keys-item-pitchname"
-            >
-              {{ whiteKeyInfo.name }}
-            </text>
-          </g>
-        </symbol>
-        <symbol id="black-keys">
-          <rect
-            v-for="(blackKeyInfo, index) in blackKeyInfos"
-            :key="index"
-            :x="blackKeyRects[index].x - 0.5"
-            :y="blackKeyRects[index].y + 0.5"
-            :width="blackKeyRects[index].width"
-            :height="blackKeyRects[index].height"
-            rx="2"
-            ry="2"
-            class="sequencer-keys-item-black"
-            :title="blackKeyInfo.name"
-          />
-        </symbol>
-      </defs>
-      <use href="#white-keys" :y="-offset" />
-      <use href="#black-keys" :y="-offset" />
+      <g
+        v-for="(whiteKeyInfo, index) in whiteKeyInfos"
+        :key="index"
+        @mousedown="onMouseDown(whiteKeyInfo.noteNumber)"
+        @mouseenter="onMouseEnter(whiteKeyInfo.noteNumber)"
+      >
+        <rect
+          :x="whiteKeyRects[index].x - 0.5"
+          :y="whiteKeyRects[index].y + 0.5 - offset"
+          :width="whiteKeyRects[index].width"
+          :height="whiteKeyRects[index].height"
+          :title="whiteKeyInfo.name"
+          :class="
+            noteNumberOfKeyBeingPressed === whiteKeyInfo.noteNumber
+              ? 'white-key-being-pressed'
+              : 'white-key'
+          "
+        />
+        <text
+          v-if="whiteKeyInfo.pitch === 'C'"
+          font-size="10"
+          :x="whiteKeyRects[index].x + whiteKeyRects[index].width - 18"
+          :y="whiteKeyRects[index].y + whiteKeyRects[index].height - 4 - offset"
+          class="pitchname"
+        >
+          {{ whiteKeyInfo.name }}
+        </text>
+      </g>
+      <rect
+        v-for="(blackKeyInfo, index) in blackKeyInfos"
+        :key="index"
+        :x="blackKeyRects[index].x - 0.5"
+        :y="blackKeyRects[index].y + 0.5 - offset"
+        :width="blackKeyRects[index].width"
+        :height="blackKeyRects[index].height"
+        rx="2"
+        ry="2"
+        :title="blackKeyInfo.name"
+        :class="
+          noteNumberOfKeyBeingPressed === blackKeyInfo.noteNumber
+            ? 'black-key-being-pressed'
+            : 'black-key'
+        "
+        @mousedown="onMouseDown(blackKeyInfo.noteNumber)"
+        @mouseenter="onMouseEnter(blackKeyInfo.noteNumber)"
+      />
     </svg>
   </div>
 </template>
@@ -103,10 +110,37 @@ export default defineComponent({
         };
       });
     });
+    const noteNumberOfKeyBeingPressed = ref<number | undefined>();
 
     const sequencerKeys = ref<HTMLElement | null>(null);
     let resizeObserver: ResizeObserver | undefined;
 
+    const onMouseDown = (noteNumber: number) => {
+      noteNumberOfKeyBeingPressed.value = noteNumber;
+      store.dispatch("PLAY_PREVIEW_SOUND", { noteNumber });
+    };
+
+    const onMouseUp = () => {
+      if (noteNumberOfKeyBeingPressed.value !== undefined) {
+        const noteNumber = noteNumberOfKeyBeingPressed.value;
+        noteNumberOfKeyBeingPressed.value = undefined;
+        store.dispatch("STOP_PREVIEW_SOUND", { noteNumber });
+      }
+    };
+
+    const onMouseEnter = (noteNumber: number) => {
+      if (
+        noteNumberOfKeyBeingPressed.value !== undefined &&
+        noteNumberOfKeyBeingPressed.value !== noteNumber
+      ) {
+        store.dispatch("STOP_PREVIEW_SOUND", {
+          noteNumber: noteNumberOfKeyBeingPressed.value,
+        });
+        noteNumberOfKeyBeingPressed.value = noteNumber;
+        store.dispatch("PLAY_PREVIEW_SOUND", { noteNumber });
+      }
+    };
+
     onMounted(() => {
       const sequencerKeysElement = sequencerKeys.value;
       if (!sequencerKeysElement) {
@@ -124,10 +158,13 @@ export default defineComponent({
         }
       });
       resizeObserver.observe(sequencerKeysElement);
+
+      document.addEventListener("mouseup", onMouseUp);
     });
 
     onUnmounted(() => {
       resizeObserver?.disconnect();
+      document.removeEventListener("mouseup", onMouseUp);
     });
 
     return {
@@ -141,6 +178,9 @@ export default defineComponent({
       whiteKeyRects,
       blackKeyRects,
       sequencerKeys,
+      noteNumberOfKeyBeingPressed,
+      onMouseDown,
+      onMouseEnter,
     };
   },
 });
@@ -157,16 +197,25 @@ export default defineComponent({
   overflow: hidden;
 }
 
-.sequencer-keys-item-white {
+.white-key {
   fill: #fff;
   stroke: #ccc;
 }
 
-.sequencer-keys-item-black {
+.white-key-being-pressed {
+  fill: colors.$primary;
+  stroke: colors.$primary;
+}
+
+.black-key {
   fill: #5a5a5a;
 }
 
-.sequencer-keys-item-pitchname {
+.black-key-being-pressed {
+  fill: colors.$primary;
+}
+
+.pitchname {
   fill: #555;
 }
 </style>
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 4518ebca62..149440b4fe 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -63,6 +63,7 @@ import {
   getKeyBaseHeight,
   tickToBaseX,
   noteNumberToBaseY,
+  PREVIEW_SOUND_DURATION,
 } from "@/helpers/singHelper";
 
 export default defineComponent({
@@ -126,34 +127,40 @@ export default defineComponent({
       }
     };
 
+    const selectThisNote = () => {
+      const noteIds = [...state.selectedNoteIds, props.note.id];
+      store.dispatch("SET_SELECTED_NOTE_IDS", {
+        noteIds,
+      });
+      store.dispatch("PLAY_PREVIEW_SOUND", {
+        noteNumber: props.note.noteNumber,
+        duration: PREVIEW_SOUND_DURATION,
+      });
+    };
+
     const handleKeydown = (event: KeyboardEvent) => {
       emit("handleNotesKeydown", event);
     };
 
     const handleMouseDown = (event: MouseEvent) => {
       if (!state.selectedNoteIds.includes(props.note.id)) {
-        const noteIds = [...state.selectedNoteIds, props.note.id];
-        store.dispatch("SET_SELECTED_NOTE_IDS", {
-          noteIds,
-        });
+        selectThisNote();
       } else {
         emit("handleDragMoveStart", event);
       }
     };
 
     const handleDragRightStart = (event: MouseEvent) => {
-      const noteIds = [...state.selectedNoteIds, props.note.id];
-      store.dispatch("SET_SELECTED_NOTE_IDS", {
-        noteIds,
-      });
+      if (!state.selectedNoteIds.includes(props.note.id)) {
+        selectThisNote();
+      }
       emit("handleDragRightStart", event);
     };
 
     const handleDragLeftStart = (event: MouseEvent) => {
-      const noteIds = [...state.selectedNoteIds, props.note.id];
-      store.dispatch("SET_SELECTED_NOTE_IDS", {
-        noteIds,
-      });
+      if (!state.selectedNoteIds.includes(props.note.id)) {
+        selectThisNote();
+      }
       emit("handleDragLeftStart", event);
     };
 
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index 9ac118a7b6..f40efed8a0 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -10,6 +10,14 @@ export const DEFAULT_BEAT_TYPE = 4;
 const BASE_X_PER_QUARTER_NOTE = 120;
 const BASE_Y_PER_NOTE_NUMBER = 30;
 
+export const ZOOM_X_MIN = 0.2;
+export const ZOOM_X_MAX = 1;
+export const ZOOM_X_STEP = 0.05;
+export const ZOOM_Y_MIN = 0.35;
+export const ZOOM_Y_MAX = 1;
+export const ZOOM_Y_STEP = 0.05;
+export const PREVIEW_SOUND_DURATION = 0.1;
+
 export function noteNumberToFrequency(noteNumber: number) {
   return 440 * 2 ** ((noteNumber - 69) / 12);
 }
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 0985f44764..80efa8204b 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -664,10 +664,11 @@ type SynthVoiceParams = {
  */
 class SynthVoice {
   readonly noteNumber: number;
+  private readonly audioContext: BaseAudioContext;
+  private readonly ampParams: SynthAmpParams;
   private readonly oscNode: OscillatorNode;
   private readonly gainNode: GainNode;
   private readonly filterNode: BiquadFilterNode;
-  private readonly ampParams: SynthAmpParams;
 
   private _isActive = false;
   private _isStopped = false;
@@ -687,6 +688,7 @@ class SynthVoice {
 
   constructor(audioContext: BaseAudioContext, params: SynthVoiceParams) {
     this.noteNumber = params.noteNumber;
+    this.audioContext = audioContext;
     this.ampParams = params.amp;
 
     this.oscNode = new OscillatorNode(audioContext);
@@ -702,7 +704,7 @@ class SynthVoice {
       params.noteNumber
     );
     this.filterNode.Q.value = this.calcFilterQ(params.filter.resonance);
-    this.gainNode = new GainNode(audioContext);
+    this.gainNode = new GainNode(audioContext, { gain: 0 });
     this.oscNode.connect(this.filterNode);
     this.filterNode.connect(this.gainNode);
   }
@@ -726,18 +728,28 @@ class SynthVoice {
     return this.linearToDecibel(Math.SQRT1_2) + resonance;
   }
 
+  private getMinContextTime(audioContext: BaseAudioContext) {
+    if (audioContext instanceof AudioContext) {
+      const renderQuantumSize = 128;
+      const latency = (renderQuantumSize + 10) / audioContext.sampleRate;
+      return audioContext.currentTime + latency;
+    } else {
+      return 0;
+    }
+  }
+
   /**
    * ノートオンをスケジュールします。
    * @param contextTime ノートオンを行う時刻（コンテキスト時間）
    */
   noteOn(contextTime: number) {
-    const t0 = contextTime;
+    const minContextTime = this.getMinContextTime(this.audioContext);
+    const t0 = Math.max(minContextTime, contextTime);
     const atk = this.ampParams.attack;
     const dcy = this.ampParams.decay;
     const sus = this.ampParams.sustain;
 
     // アタック、ディケイ、サスティーンのスケジュールを行う
-    this.gainNode.gain.value = 0;
     this.gainNode.gain.setValueAtTime(0, t0);
     this.gainNode.gain.linearRampToValueAtTime(1, t0 + atk);
     this.gainNode.gain.setTargetAtTime(sus, t0 + atk, dcy);
@@ -757,7 +769,8 @@ class SynthVoice {
    * @param contextTime ノートオフを行う時刻（コンテキスト時間）
    */
   noteOff(contextTime: number) {
-    const t0 = contextTime;
+    const minContextTime = this.getMinContextTime(this.audioContext);
+    const t0 = Math.max(minContextTime, contextTime);
     const rel = this.ampParams.release;
     const stopContextTime = t0 + rel * 4;
 
@@ -806,19 +819,19 @@ export class PolySynth implements Instrument {
       type: "square",
     };
     this.filterParams = options?.filter ?? {
-      cutoff: 3300,
+      cutoff: 3000,
       resonance: 0,
-      keyTrack: 0.25,
+      keyTrack: 0.26,
     };
     this.ampParams = options?.amp ?? {
       attack: 0.001,
       decay: 0.18,
-      sustain: 0.3,
+      sustain: 0.4,
       release: 0.02,
     };
 
     this.gainNode = new GainNode(this.audioContext);
-    this.gainNode.gain.value = options?.volume ?? 0.13;
+    this.gainNode.gain.value = options?.volume ?? 0.12;
   }
 
   /**
diff --git a/src/store/singing.ts b/src/store/singing.ts
index c8aa966b6e..6ad04d893b 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -262,6 +262,7 @@ const isValidScore = (score: Score) => {
 
 let audioContext: AudioContext | undefined;
 let transport: Transport | undefined;
+let previewSynth: PolySynth | undefined;
 let channelStrip: ChannelStrip | undefined;
 let limiter: Limiter | undefined;
 let clipper: Clipper | undefined;
@@ -270,10 +271,12 @@ let clipper: Clipper | undefined;
 if (window.AudioContext) {
   audioContext = new AudioContext();
   transport = new Transport(audioContext);
+  previewSynth = new PolySynth(audioContext);
   channelStrip = new ChannelStrip(audioContext);
   limiter = new Limiter(audioContext);
   clipper = new Clipper(audioContext);
 
+  previewSynth.output.connect(channelStrip.input);
   channelStrip.output.connect(limiter.input);
   limiter.output.connect(clipper.input);
   clipper.output.connect(audioContext.destination);
@@ -895,6 +898,37 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  PLAY_PREVIEW_SOUND: {
+    async action(
+      _,
+      { noteNumber, duration }: { noteNumber: number; duration?: number }
+    ) {
+      if (!audioContext) {
+        throw new Error("audioContext is undefined.");
+      }
+      if (!previewSynth) {
+        throw new Error("previewSynth is undefined.");
+      }
+      previewSynth.noteOn(0, noteNumber);
+      if (duration !== undefined) {
+        const contextTime = audioContext.currentTime;
+        previewSynth.noteOff(contextTime + duration, noteNumber);
+      }
+    },
+  },
+
+  STOP_PREVIEW_SOUND: {
+    async action(_, { noteNumber }: { noteNumber: number }) {
+      if (!audioContext) {
+        throw new Error("audioContext is undefined.");
+      }
+      if (!previewSynth) {
+        throw new Error("previewSynth is undefined.");
+      }
+      previewSynth.noteOff(0, noteNumber);
+    },
+  },
+
   SET_IS_DRAG: {
     mutation(state, { isDrag }: { isDrag: boolean }) {
       state.isDrag = isDrag;
diff --git a/src/store/type.ts b/src/store/type.ts
index b2a6deef02..a254428141 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -973,6 +973,14 @@ export type SingingStoreTypes = {
     action(payload: { volume: number }): void;
   };
 
+  PLAY_PREVIEW_SOUND: {
+    action(payload: { noteNumber: number; duration?: number }): void;
+  };
+
+  STOP_PREVIEW_SOUND: {
+    action(payload: { noteNumber: number }): void;
+  };
+
   UPDATE_PERIODIC_PITCH: {
     action(payload: {
       audioQuery: AudioQuery;

From b7e4e54252f91dd009270a5be6833bc8b627360d Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sat, 23 Dec 2023 16:21:26 +0900
Subject: [PATCH 38/59] =?UTF-8?q?[project-s]=20=E9=87=8D=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=83=8E=E3=83=BC=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E6=A4=9C=E5=87=BA=E3=81=97=E3=81=A6=E8=89=B2=E3=82=92=E5=A4=89?=
 =?UTF-8?q?=E3=81=88=E3=81=A6=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1676)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 重なっているノートの色を変える機能を実装

* 修正、コメントを追加
---
 src/components/Sing/ScoreSequencer.vue | 232 +++++++-------------
 src/components/Sing/SequencerNote.vue  |  34 +--
 src/store/singing.ts                   | 285 +++++++++++++++++--------
 src/store/type.ts                      |  35 +--
 tests/unit/store/Vuex.spec.ts          |   1 +
 5 files changed, 310 insertions(+), 277 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 326181e726..9fdf6b1ff6 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -190,6 +190,7 @@ import {
   ZOOM_Y_STEP,
   PREVIEW_SOUND_DURATION,
 } from "@/helpers/singHelper";
+import { Note } from "@/store/type";
 
 export default defineComponent({
   name: "SingScoreSequencer",
@@ -293,7 +294,10 @@ export default defineComponent({
       const baseX = tickToBaseX(playheadTicks.value, tpqn.value);
       return Math.floor(baseX * zoomX.value);
     });
-    const selectedNoteIds = computed(() => state.selectedNoteIds);
+    const selectedNotes = computed(() => {
+      const selectedNoteIds = new Set(state.selectedNoteIds);
+      return notes.value.filter((value) => selectedNoteIds.has(value.id));
+    });
     const phraseInfos = computed(() => {
       return Object.entries(state.phrases).map(([key, phrase]) => {
         const startBaseX = tickToBaseX(phrase.startTicks, tpqn.value);
@@ -325,14 +329,8 @@ export default defineComponent({
       const lyric = getDoremiFromNoteNumber(noteNumber);
       // NOTE: 仮ID
       const id = uuidv4();
-      store.dispatch("ADD_NOTE", {
-        note: {
-          id,
-          position,
-          noteNumber,
-          duration,
-          lyric,
-        },
+      store.dispatch("ADD_NOTES", {
+        notes: [{ id, position, noteNumber, duration, lyric }],
       });
       store.dispatch("PLAY_PREVIEW_SOUND", {
         noteNumber,
@@ -343,8 +341,8 @@ export default defineComponent({
     // マウスダウン
     // 選択中のノートがある場合は選択リセット
     const handleMouseDown = () => {
-      if (0 < selectedNoteIds.value.length) {
-        store.dispatch("CLEAR_SELECTED_NOTE_IDS");
+      if (0 < selectedNotes.value.length) {
+        store.dispatch("DESELECT_ALL_NOTES");
       }
     };
 
@@ -364,20 +362,12 @@ export default defineComponent({
         cancelAnimationFrame(dragId.value);
         dragMode.value = DragMode.NONE;
 
-        if (selectedNoteIds.value.length === 1) {
-          const selectedNoteId = selectedNoteIds.value[0];
-          const selectedNote = state.score.notes.find((value) => {
-            return value.id === selectedNoteId;
-          });
-          if (!selectedNote) {
-            throw new Error("selectedNote is undefined.");
-          }
+        if (selectedNotes.value.length === 1) {
           store.dispatch("PLAY_PREVIEW_SOUND", {
-            noteNumber: selectedNote.noteNumber,
+            noteNumber: selectedNotes.value[0].noteNumber,
             duration: PREVIEW_SOUND_DURATION,
           });
         }
-        return;
       }
     };
 
@@ -410,39 +400,30 @@ export default defineComponent({
       }
 
       // 選択中のノートのpositionとnoteNumberを変更
-      let isNotesChanged = false;
-      const newNotes = state.score.notes.map((note) => {
-        if (selectedNoteIds.value.includes(note.id)) {
-          if (amountPositionX === 0 && amountPositionY === 0) {
-            return note;
-          }
-          isNotesChanged = true;
-          const position = note.position + amountPositionX;
-          const noteNumber = note.noteNumber + amountPositionY;
-          return {
-            ...note,
-            noteNumber,
-            position,
-          };
-        } else {
-          return note;
+      const editedNotes: Note[] = [];
+      for (const note of selectedNotes.value) {
+        if (amountPositionX === 0 && amountPositionY === 0) {
+          continue;
         }
-      });
+        const position = note.position + amountPositionX;
+        const noteNumber = note.noteNumber + amountPositionY;
+        editedNotes.push({ ...note, noteNumber, position });
+      }
 
       // 左端より前はドラッグしない
-      if (newNotes.some((note) => note.position < 0)) {
+      if (editedNotes.some((note) => note.position < 0)) {
         dragId.value = requestAnimationFrame(dragMove);
         return;
       }
-      if (isNotesChanged) {
-        store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+      if (editedNotes.length !== 0) {
+        store.dispatch("UPDATE_NOTES", { notes: editedNotes });
       }
       dragId.value = requestAnimationFrame(dragMove);
     };
 
     // ノートドラッグ開始
     const handleDragMoveStart = (event: MouseEvent) => {
-      if (selectedNoteIds.value.length > 0) {
+      if (selectedNotes.value.length > 0) {
         dragMode.value = DragMode.MOVE;
         setTimeout(() => {
           dragMoveCurrentX.value = event.clientX;
@@ -461,32 +442,23 @@ export default defineComponent({
       }
       const distanceX = cursorX.value - dragDurationCurrentX.value;
       if (snapWidth.value <= Math.abs(distanceX)) {
-        let isNotesChanged = false;
-        const newNotes = state.score.notes.map((note) => {
-          if (selectedNoteIds.value.includes(note.id)) {
-            const duration =
-              note.duration +
-              (0 < distanceX ? snapTicks.value : -snapTicks.value);
-            if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
-              return note;
-            } else {
-              isNotesChanged = true;
-              return {
-                ...note,
-                duration,
-              };
-            }
-          } else {
-            return note;
+        const editedNotes: Note[] = [];
+        for (const note of selectedNotes.value) {
+          const duration =
+            note.duration +
+            (0 < distanceX ? snapTicks.value : -snapTicks.value);
+          if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
+            continue;
           }
-        });
+          editedNotes.push({ ...note, duration });
+        }
         const dragDurationCurrentXNext =
           dragDurationCurrentX.value +
           (0 < distanceX ? snapWidth.value : -snapWidth.value);
         dragDurationCurrentX.value = dragDurationCurrentXNext;
         dragId.value = requestAnimationFrame(dragRight);
-        if (isNotesChanged) {
-          store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+        if (editedNotes.length !== 0) {
+          store.dispatch("UPDATE_NOTES", { notes: editedNotes });
         }
       }
       dragId.value = requestAnimationFrame(dragRight);
@@ -510,36 +482,26 @@ export default defineComponent({
       }
       const distanceX = cursorX.value - dragDurationCurrentX.value;
       if (snapWidth.value <= Math.abs(distanceX)) {
-        let isNotesChanged = false;
-        const newNotes = state.score.notes.map((note) => {
-          if (selectedNoteIds.value.includes(note.id)) {
-            const position =
-              note.position +
-              (0 < distanceX ? snapTicks.value : -snapTicks.value);
-            const duration =
-              note.duration +
-              (0 > distanceX ? snapTicks.value : -snapTicks.value);
-            if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
-              return note;
-            } else {
-              isNotesChanged = true;
-              return {
-                ...note,
-                position,
-                duration,
-              };
-            }
-          } else {
-            return note;
+        const editedNotes: Note[] = [];
+        for (const note of selectedNotes.value) {
+          const position =
+            note.position +
+            (0 < distanceX ? snapTicks.value : -snapTicks.value);
+          const duration =
+            note.duration +
+            (0 > distanceX ? snapTicks.value : -snapTicks.value);
+          if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
+            continue;
           }
-        });
+          editedNotes.push({ ...note, position, duration });
+        }
         const dragDurationCurrentXNext =
           dragDurationCurrentX.value +
           (0 < distanceX ? snapWidth.value : -snapWidth.value);
         dragDurationCurrentX.value = dragDurationCurrentXNext;
         dragId.value = requestAnimationFrame(dragLeft);
-        if (isNotesChanged) {
-          store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+        if (editedNotes.length !== 0) {
+          store.dispatch("UPDATE_NOTES", { notes: editedNotes });
         }
       }
       dragId.value = requestAnimationFrame(dragLeft);
@@ -600,94 +562,62 @@ export default defineComponent({
 
     // キーボードイベント
     const handleNotesArrowUp = () => {
-      let changedNoteNumber: number | undefined;
-      const newNotes = state.score.notes.map((note) => {
-        if (selectedNoteIds.value.includes(note.id)) {
-          const noteNumber = Math.min(note.noteNumber + 1, 127);
-          changedNoteNumber = noteNumber;
-          return {
-            ...note,
-            noteNumber,
-          };
-        } else {
-          return note;
-        }
-      });
-      if (newNotes.some((note) => note.noteNumber > 127)) {
+      const editedNotes: Note[] = [];
+      for (const note of selectedNotes.value) {
+        const noteNumber = Math.min(note.noteNumber + 1, 127);
+        editedNotes.push({ ...note, noteNumber });
+      }
+      if (editedNotes.some((note) => note.noteNumber > 127)) {
         return;
       }
-      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
-      if (
-        changedNoteNumber !== undefined &&
-        selectedNoteIds.value.length === 1
-      ) {
+      store.dispatch("UPDATE_NOTES", { notes: editedNotes });
+
+      if (editedNotes.length === 1) {
         store.dispatch("PLAY_PREVIEW_SOUND", {
-          noteNumber: changedNoteNumber,
+          noteNumber: editedNotes[0].noteNumber,
           duration: PREVIEW_SOUND_DURATION,
         });
       }
     };
 
     const handleNotesArrowDown = () => {
-      let changedNoteNumber: number | undefined;
-      const newNotes = state.score.notes.map((note) => {
-        if (selectedNoteIds.value.includes(note.id)) {
-          const noteNumber = Math.max(note.noteNumber - 1, 0);
-          changedNoteNumber = noteNumber;
-          return {
-            ...note,
-            noteNumber,
-          };
-        } else {
-          return note;
-        }
-      });
-      if (newNotes.some((note) => note.noteNumber < 0)) {
+      const editedNotes: Note[] = [];
+      for (const note of selectedNotes.value) {
+        const noteNumber = Math.max(note.noteNumber - 1, 0);
+        editedNotes.push({ ...note, noteNumber });
+      }
+      if (editedNotes.some((note) => note.noteNumber < 0)) {
         return;
       }
-      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
-      if (
-        changedNoteNumber !== undefined &&
-        selectedNoteIds.value.length === 1
-      ) {
+      store.dispatch("UPDATE_NOTES", { notes: editedNotes });
+
+      if (editedNotes.length === 1) {
         store.dispatch("PLAY_PREVIEW_SOUND", {
-          noteNumber: changedNoteNumber,
+          noteNumber: editedNotes[0].noteNumber,
           duration: PREVIEW_SOUND_DURATION,
         });
       }
     };
 
     const handleNotesArrowRight = () => {
-      const newNotes = state.score.notes.map((note) => {
-        if (selectedNoteIds.value.includes(note.id)) {
-          const position = note.position + snapTicks.value;
-          return {
-            ...note,
-            position,
-          };
-        } else {
-          return note;
-        }
-      });
-      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+      const editedNotes: Note[] = [];
+      for (const note of selectedNotes.value) {
+        const position = note.position + snapTicks.value;
+        editedNotes.push({ ...note, position });
+      }
+      store.dispatch("UPDATE_NOTES", { notes: editedNotes });
     };
 
     const handleNotesArrowLeft = () => {
-      const newNotes = state.score.notes.map((note) => {
-        if (selectedNoteIds.value.includes(note.id)) {
-          const position = note.position - snapTicks.value;
-          return {
-            ...note,
-            position,
-          };
-        } else {
-          return note;
-        }
-      });
-      if (newNotes.some((note) => note.position < 0)) {
+      const editedNotes: Note[] = [];
+      for (const note of selectedNotes.value) {
+        const position = note.position - snapTicks.value;
+        editedNotes.push({ ...note, position });
+      }
+      if (editedNotes.some((note) => note.position < 0)) {
         return;
       }
-      store.dispatch("REPLACE_ALL_NOTES", { notes: newNotes });
+      store.dispatch("UPDATE_NOTES", { notes: editedNotes });
     };
 
     const handleNotesBackspaceOrDelete = () => {
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 149440b4fe..1e689e3722 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    :class="`sequencer-note ${isSelected ? 'selected' : ''}`"
+    :class="classNamesStr"
     :style="{
       transform: `translate3d(${positionX}px,${positionY}px,0)`,
     }"
@@ -104,12 +104,18 @@ export default defineComponent({
       const noteEndBaseX = tickToBaseX(noteEndTicks, tpqn.value);
       return (noteEndBaseX - noteStartBaseX) * zoomX.value;
     });
-    const isSelected = computed(() => {
-      return state.selectedNoteIds.includes(props.note.id);
+    const classNamesStr = computed(() => {
+      if (state.selectedNoteIds.includes(props.note.id)) {
+        return "sequencer-note selected";
+      }
+      if (state.overlappingNoteIds.includes(props.note.id)) {
+        return "sequencer-note overlapping";
+      }
+      return "sequencer-note";
     });
 
     const removeNote = () => {
-      store.dispatch("REMOVE_NOTE", { id: props.note.id });
+      store.dispatch("REMOVE_NOTES", { noteIds: [props.note.id] });
     };
 
     const setLyric = (event: Event) => {
@@ -118,20 +124,12 @@ export default defineComponent({
       }
       if (event.target.value) {
         const lyric = event.target.value;
-        store.dispatch("UPDATE_NOTE", {
-          note: {
-            ...props.note,
-            lyric,
-          },
-        });
+        store.dispatch("UPDATE_NOTES", { notes: [{ ...props.note, lyric }] });
       }
     };
 
     const selectThisNote = () => {
-      const noteIds = [...state.selectedNoteIds, props.note.id];
-      store.dispatch("SET_SELECTED_NOTE_IDS", {
-        noteIds,
-      });
+      store.dispatch("SELECT_NOTES", { noteIds: [props.note.id] });
       store.dispatch("PLAY_PREVIEW_SOUND", {
         noteNumber: props.note.noteNumber,
         duration: PREVIEW_SOUND_DURATION,
@@ -171,7 +169,7 @@ export default defineComponent({
       positionY,
       barHeight,
       barWidth,
-      isSelected,
+      classNamesStr,
       removeNote,
       setLyric,
       handleKeydown,
@@ -200,6 +198,12 @@ export default defineComponent({
       cursor: move;
     }
   }
+
+  &.overlapping {
+    .sequencer-note-bar-body {
+      fill: rgba(colors.$primary-rgb, 0.5);
+    }
+  }
 }
 
 .sequencer-note-lyric {
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 6ad04d893b..68566b4ab0 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -260,6 +260,92 @@ const isValidScore = (score: Score) => {
   );
 };
 
+type NoteInfo = {
+  startTicks: number;
+  endTicks: number;
+  overlappingNoteIds: Set<string>;
+};
+
+class OverlappingNotesDetector {
+  private readonly noteInfos = new Map<string, NoteInfo>();
+
+  addNotes(notes: Note[]) {
+    for (const note of notes) {
+      this.noteInfos.set(note.id, {
+        startTicks: note.position,
+        endTicks: note.position + note.duration,
+        overlappingNoteIds: new Set<string>(),
+      });
+    }
+    // TODO: 計算量がO(n^2)になっているので、区間木などを使用してO(nlogn)にする
+    for (const note of notes) {
+      const overlappingNoteIds = new Set<string>();
+      for (const [noteId, noteInfo] of this.noteInfos) {
+        if (noteId === note.id) {
+          continue;
+        }
+        if (noteInfo.startTicks >= note.position + note.duration) {
+          continue;
+        }
+        if (noteInfo.endTicks <= note.position) {
+          continue;
+        }
+        overlappingNoteIds.add(noteId);
+      }
+
+      const noteId1 = note.id;
+      const noteInfo1 = this.noteInfos.get(noteId1);
+      if (!noteInfo1) {
+        throw new Error("noteInfo1 is undefined.");
+      }
+      for (const noteId2 of overlappingNoteIds) {
+        const noteInfo2 = this.noteInfos.get(noteId2);
+        if (!noteInfo2) {
+          throw new Error("noteInfo2 is undefined.");
+        }
+        noteInfo2.overlappingNoteIds.add(noteId1);
+        noteInfo1.overlappingNoteIds.add(noteId2);
+      }
+    }
+  }
+
+  removeNotes(notes: Note[]) {
+    for (const note of notes) {
+      const noteId1 = note.id;
+      const noteInfo1 = this.noteInfos.get(noteId1);
+      if (!noteInfo1) {
+        throw new Error("noteInfo1 is undefined.");
+      }
+      for (const noteId2 of noteInfo1.overlappingNoteIds) {
+        const noteInfo2 = this.noteInfos.get(noteId2);
+        if (!noteInfo2) {
+          throw new Error("noteInfo2 is undefined.");
+        }
+        noteInfo2.overlappingNoteIds.delete(noteId1);
+        noteInfo1.overlappingNoteIds.delete(noteId2);
+      }
+    }
+    for (const note of notes) {
+      this.noteInfos.delete(note.id);
+    }
+  }
+
+  updateNotes(notes: Note[]) {
+    this.removeNotes(notes);
+    this.addNotes(notes);
+  }
+
+  getOverlappingNoteIds() {
+    const overlappingNoteIds: string[] = [];
+    for (const [noteId, noteInfo] of this.noteInfos) {
+      if (noteInfo.overlappingNoteIds.size !== 0) {
+        overlappingNoteIds.push(noteId);
+      }
+    }
+    return overlappingNoteIds;
+  }
+}
+
 let audioContext: AudioContext | undefined;
 let transport: Transport | undefined;
 let previewSynth: PolySynth | undefined;
@@ -289,6 +375,7 @@ type PhraseData = {
 };
 
 const playheadPosition = new FrequentlyUpdatedState(0);
+const overlappingNotesDetector = new OverlappingNotesDetector();
 const phraseDataMap = new Map<string, PhraseData>();
 const phraseAudioBlobCache = new Map<string, Blob>();
 const animationFrameRunner = new AnimationFrameRunner();
@@ -319,8 +406,9 @@ export const singingStoreState: SingingStoreState = {
   sequencerZoomY: 0.75,
   sequencerScrollY: 60, // Y軸 note number
   sequencerScrollX: 0, // X軸 tick(仮)
-  sequencerSnapType: 16, // スナップタイプ 試行用で1/16で固定
-  selectedNoteIds: [], // 選択中のノート
+  sequencerSnapType: 16, // スナップタイプ
+  selectedNoteIds: [],
+  overlappingNoteIds: [],
   nowPlaying: false,
   volume: 0,
   leftLocatorPosition: 0,
@@ -392,7 +480,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   SET_SCORE: {
     mutation(state, { score }: { score: Score }) {
+      const oldNotes = state.score.notes;
       state.score = score;
+      state.selectedNoteIds = [];
+      overlappingNotesDetector.removeNotes(oldNotes);
+      overlappingNotesDetector.addNotes(score.notes);
+      state.overlappingNoteIds =
+        overlappingNotesDetector.getOverlappingNoteIds();
     },
     async action(
       { state, getters, commit, dispatch },
@@ -407,7 +501,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (state.nowPlaying) {
         await dispatch("SING_STOP_AUDIO");
       }
-      commit("CLEAR_SELECTED_NOTE_IDS");
       commit("SET_SCORE", { score });
       transport.time = getters.TICK_TO_SECOND(playheadPosition.value);
 
@@ -555,81 +648,89 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  ADD_NOTE: {
-    mutation(state, { note }: { note: Note }) {
-      const notes = [...state.score.notes];
-      notes.push(note);
-      notes.sort((a, b) => a.position - b.position);
-      state.score.notes = notes;
-      state.selectedNoteIds.push(note.id);
-    },
-    // ノートを追加する
-    // NOTE: 重複削除など別途追加
-    async action({ commit, dispatch }, { note }: { note: Note }) {
-      if (!isValidNote(note)) {
-        throw new Error("The note is invalid.");
+  ADD_NOTES: {
+    mutation(state, { notes }: { notes: Note[] }) {
+      const noteIds = notes.map((value) => value.id);
+      const scoreNotes = [...state.score.notes, ...notes];
+      scoreNotes.sort((a, b) => a.position - b.position);
+      state.score.notes = scoreNotes;
+      state.selectedNoteIds = [...state.selectedNoteIds, ...noteIds];
+      overlappingNotesDetector.addNotes(notes);
+      state.overlappingNoteIds =
+        overlappingNotesDetector.getOverlappingNoteIds();
+    },
+    async action({ state, commit, dispatch }, { notes }: { notes: Note[] }) {
+      const scoreNotes = state.score.notes;
+      const existingIds = new Set(scoreNotes.map((value) => value.id));
+      const isValidNotes = notes.every((value) => {
+        return !existingIds.has(value.id) && isValidNote(value);
+      });
+      if (!isValidNotes) {
+        throw new Error("The notes are invalid.");
       }
-      commit("ADD_NOTE", { note });
+      commit("ADD_NOTES", { notes });
 
       dispatch("RENDER");
     },
   },
 
-  UPDATE_NOTE: {
-    mutation(state, { index, note }: { index: number; note: Note }) {
-      const notes = [...state.score.notes];
-      notes.splice(index, 1, note);
-      state.score.notes = notes;
-    },
-    async action({ state, commit, dispatch }, { note }) {
-      if (!isValidNote(note)) {
-        throw new Error("The note is invalid.");
+  UPDATE_NOTES: {
+    mutation(state, { notes }: { notes: Note[] }) {
+      const notesMap = new Map<string, Note>();
+      for (const note of notes) {
+        notesMap.set(note.id, note);
       }
-      const index = state.score.notes.findIndex((value) => {
-        return value.id === note.id;
+      const scoreNotes = state.score.notes.map((value) => {
+        return notesMap.get(value.id) ?? value;
       });
-      if (index === -1) {
-        throw new Error("The note is not found.");
+      scoreNotes.sort((a, b) => a.position - b.position);
+      state.score.notes = scoreNotes;
+      overlappingNotesDetector.updateNotes(notes);
+      state.overlappingNoteIds =
+        overlappingNotesDetector.getOverlappingNoteIds();
+    },
+    async action({ state, commit, dispatch }, { notes }: { notes: Note[] }) {
+      const scoreNotes = state.score.notes;
+      const existingIds = new Set(scoreNotes.map((value) => value.id));
+      const isValidNotes = notes.every((value) => {
+        return existingIds.has(value.id) && isValidNote(value);
+      });
+      if (!isValidNotes) {
+        throw new Error("The notes are invalid.");
       }
-      commit("UPDATE_NOTE", { index, note });
+      commit("UPDATE_NOTES", { notes });
 
       dispatch("RENDER");
     },
   },
 
-  REMOVE_NOTE: {
-    mutation(state, { id }: { id: string }) {
-      const notes = state.score.notes;
-      const selectedNoteIds = state.selectedNoteIds;
-      state.score.notes = notes.filter((value) => {
-        return value.id !== id;
+  REMOVE_NOTES: {
+    mutation(state, { noteIds }: { noteIds: string[] }) {
+      const noteIdsSet = new Set(noteIds);
+      const notes = state.score.notes.filter((value) => {
+        return noteIdsSet.has(value.id);
       });
-      state.selectedNoteIds = selectedNoteIds.filter((value) => {
-        return value !== id;
+      state.score.notes = state.score.notes.filter((value) => {
+        return !noteIdsSet.has(value.id);
       });
-    },
-    async action({ state, commit, dispatch }, { id }: { id: string }) {
-      const exists = state.score.notes.some((value) => {
-        return value.id === id;
+      state.selectedNoteIds = state.selectedNoteIds.filter((value) => {
+        return !noteIdsSet.has(value);
       });
-      if (!exists) {
-        throw new Error("The note is not found.");
-      }
-      commit("REMOVE_NOTE", { id });
-
-      dispatch("RENDER");
+      overlappingNotesDetector.removeNotes(notes);
+      state.overlappingNoteIds =
+        overlappingNotesDetector.getOverlappingNoteIds();
     },
-  },
-
-  REPLACE_ALL_NOTES: {
-    mutation(state, { notes }: { notes: Note[] }) {
-      state.score.notes = notes;
-    },
-    async action({ commit, dispatch }, { notes }: { notes: Note[] }) {
-      if (!isValidNotes(notes)) {
-        throw new Error("The notes are invalid.");
+    async action(
+      { state, commit, dispatch },
+      { noteIds }: { noteIds: string[] }
+    ) {
+      const scoreNotes = state.score.notes;
+      const existingIds = new Set(scoreNotes.map((value) => value.id));
+      const isValidNoteIds = noteIds.every((value) => existingIds.has(value));
+      if (!isValidNoteIds) {
+        throw new Error("The note ids are invalid.");
       }
-      commit("REPLACE_ALL_NOTES", { notes });
+      commit("REMOVE_NOTES", { noteIds });
 
       dispatch("RENDER");
     },
@@ -639,42 +740,43 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     mutation(state, { noteIds }: { noteIds: string[] }) {
       state.selectedNoteIds = noteIds;
     },
+  },
+
+  SELECT_NOTES: {
     async action({ state, commit }, { noteIds }: { noteIds: string[] }) {
-      const notes = state.score.notes;
-      const existingIds = new Set(notes.map((value) => value.id));
-      const exist = noteIds.every((value) => existingIds.has(value));
-      if (!exist) {
-        throw new Error("Contains an ID that does not exist.");
+      const scoreNotes = state.score.notes;
+      const existingIds = new Set(scoreNotes.map((value) => value.id));
+      if (!noteIds.every((value) => existingIds.has(value))) {
+        throw new Error("The note ids are invalid.");
       }
-      commit("SET_SELECTED_NOTE_IDS", { noteIds });
+      const selectedNoteIdsSet = new Set([
+        ...state.selectedNoteIds,
+        ...noteIds,
+      ]);
+      commit("SET_SELECTED_NOTE_IDS", { noteIds: [...selectedNoteIdsSet] });
     },
   },
 
-  CLEAR_SELECTED_NOTE_IDS: {
-    mutation(state) {
-      state.selectedNoteIds = [];
-    },
+  DESELECT_ALL_NOTES: {
     async action({ commit }) {
-      commit("CLEAR_SELECTED_NOTE_IDS");
+      commit("SET_SELECTED_NOTE_IDS", { noteIds: [] });
     },
   },
 
   REMOVE_SELECTED_NOTES: {
-    mutation(state) {
-      const notes = state.score.notes;
-      const selectedNoteIds = state.selectedNoteIds;
-      state.score.notes = notes.filter((note) => {
-        return !selectedNoteIds.includes(note.id);
-      });
-      state.selectedNoteIds = [];
-    },
-    async action({ commit, dispatch }) {
-      commit("REMOVE_SELECTED_NOTES");
+    async action({ state, commit, dispatch }) {
+      commit("REMOVE_NOTES", { noteIds: state.selectedNoteIds });
 
       dispatch("RENDER");
     },
   },
 
+  SET_OVERLAPPING_NOTE_IDS: {
+    mutation(state, { noteIds }: { noteIds: string[] }) {
+      state.overlappingNoteIds = noteIds;
+    },
+  },
+
   SET_PHRASE: {
     mutation(
       state,
@@ -980,19 +1082,14 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
    */
   RENDER: {
     async action({ state, getters, commit, dispatch }) {
-      const preProcess = (score: Score) => {
-        const notes = score.notes;
-
-        // 重複するノートを除く
-        for (let i = 0; i < notes.length; i++) {
-          const note = notes[i];
-          if (i === 0) continue;
-          const lastNote = notes[i - 1];
-          if (note.position < lastNote.position + lastNote.duration) {
-            notes.splice(i, 1);
-            i--;
-          }
-        }
+      const deleteOverlappingNotes = (
+        score: Score,
+        overlappingNoteIds: string[]
+      ) => {
+        const overlappingNoteIdsSet = new Set(overlappingNoteIds);
+        score.notes = score.notes.filter((value) => {
+          return !overlappingNoteIdsSet.has(value.id);
+        });
       };
 
       const searchPhrases = async (
@@ -1211,7 +1308,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         const score = copyScore(state.score);
         const singer = copySinger(state.singer);
 
-        preProcess(score);
+        deleteOverlappingNotes(score, state.overlappingNoteIds);
 
         // Score -> Phrases
 
diff --git a/src/store/type.ts b/src/store/type.ts
index a254428141..1b8afa7aa2 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -774,6 +774,7 @@ export type SingingStoreState = {
   sequencerScrollY: number;
   sequencerSnapType: number;
   selectedNoteIds: string[];
+  overlappingNoteIds: string[];
   nowPlaying: boolean;
   volume: number;
   leftLocatorPosition: number;
@@ -821,41 +822,41 @@ export type SingingStoreTypes = {
     action(payload: { measureNumber: number }): void;
   };
 
-  ADD_NOTE: {
-    mutation: { note: Note };
-    action(payload: { note: Note }): void;
-  };
-
-  UPDATE_NOTE: {
-    mutation: { index: number; note: Note };
-    action(payload: { note: Note }): void;
-  };
-
-  REMOVE_NOTE: {
-    mutation: { id: string };
-    action(payload: { id: string }): void;
+  ADD_NOTES: {
+    mutation: { notes: Note[] };
+    action(payload: { notes: Note[] }): void;
   };
 
-  REPLACE_ALL_NOTES: {
+  UPDATE_NOTES: {
     mutation: { notes: Note[] };
     action(payload: { notes: Note[] }): void;
   };
 
+  REMOVE_NOTES: {
+    mutation: { noteIds: string[] };
+    action(payload: { noteIds: string[] }): void;
+  };
+
   SET_SELECTED_NOTE_IDS: {
     mutation: { noteIds: string[] };
+  };
+
+  SELECT_NOTES: {
     action(payload: { noteIds: string[] }): void;
   };
 
-  CLEAR_SELECTED_NOTE_IDS: {
-    mutation: void;
+  DESELECT_ALL_NOTES: {
     action(): void;
   };
 
   REMOVE_SELECTED_NOTES: {
-    mutation: void;
     action(): void;
   };
 
+  SET_OVERLAPPING_NOTE_IDS: {
+    mutation: { noteIds: string[] };
+  };
+
   SET_PHRASE: {
     mutation: { phraseKey: string; phrase: Phrase };
   };
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index 940c2065f3..caf1da18d5 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -173,6 +173,7 @@ describe("store/vuex.js test", () => {
         sequencerScrollY: 60,
         sequencerSnapType: 16,
         selectedNoteIds: [],
+        overlappingNoteIds: [],
         nowPlaying: false,
         volume: 0,
         leftLocatorPosition: 0,

From 3dedb71b9735b6ad733ca74b61cfafb9872c533c Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Sat, 23 Dec 2023 16:36:24 +0900
Subject: [PATCH 39/59] update package lock

---
 package-lock.json | 278 ++++++++--------------------------------------
 1 file changed, 45 insertions(+), 233 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3367937495..b365c241fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2982,64 +2982,6 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/agentkeepalive": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
-      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -6648,21 +6590,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/eslint/node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -6723,15 +6650,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/ignore": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@ -6759,15 +6677,6 @@
         "node": "*"
       }
     },
-    "node_modules/eslint/node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -6777,18 +6686,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -8610,12 +8507,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "devOptional": true
-    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -9205,6 +9096,19 @@
         "node": ">= 8"
       }
     },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/midi-file": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/midi-file/-/midi-file-1.2.3.tgz",
@@ -11748,6 +11652,17 @@
         }
       }
     },
+    "node_modules/terser-webpack-plugin/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "node_modules/terser-webpack-plugin/node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -15456,48 +15371,6 @@
         "debug": "4"
       }
     },
-    "agentkeepalive": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
-      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
-        "humanize-ms": "^1.2.1"
-      }
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "requires": {
-        "ajv": "^8.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.12.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        }
-      }
-    },
     "ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -18338,61 +18211,6 @@
             "uri-js": "^4.2.2"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "dir-glob": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-          "dev": true,
-          "requires": {
-            "path-type": "^4.0.0"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
         "eslint-scope": {
           "version": "7.2.2",
           "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -18432,12 +18250,6 @@
             "slash": "^3.0.0"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "ignore": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@ -18459,27 +18271,12 @@
             "brace-expansion": "^1.1.7"
           }
         },
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true
-        },
         "slash": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
           "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -19967,12 +19764,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "devOptional": true
-    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -20456,6 +20247,16 @@
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
     "midi-file": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/midi-file/-/midi-file-1.2.3.tgz",
@@ -22360,6 +22161,17 @@
         "terser": "^5.16.8"
       },
       "dependencies": {
+        "@jridgewell/trace-mapping": {
+          "version": "0.3.20",
+          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+          "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+          "dev": true,
+          "peer": true,
+          "requires": {
+            "@jridgewell/resolve-uri": "^3.1.0",
+            "@jridgewell/sourcemap-codec": "^1.4.14"
+          }
+        },
         "ajv": {
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",

From 259e8a0fdfa1613385efd3f8b4cf1b317e57b0f8 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Thu, 28 Dec 2023 12:53:00 +0900
Subject: [PATCH 40/59] =?UTF-8?q?[project-s]=20=E3=83=89=E3=83=A9=E3=83=83?=
 =?UTF-8?q?=E3=82=B0=E5=91=A8=E3=82=8A=E3=81=AE=E6=95=B4=E7=90=86=E3=81=A8?=
 =?UTF-8?q?=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0=20(#1680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ドラッグ周りを整理

* 修正とリファクタリング

* 修正、カーソルやダブルクリック周りを変更

* 修正

* ダブルクリックの型変更

* === undefinedはなるべく避ける

* TODO: 例外処理は`UPDATE_NOTES`内に移す？

* コメント追加

* TODO: 例外処理は`REMOVE_SELECTED_NOTES`内に移す？

* Update src/components/Sing/ScoreSequencer.vue

* FIXME: 無効状態はstring以外の型にする

* FIXME: 関連する値を１つのobjectにまとめる

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/components/Sing/ScoreSequencer.vue | 658 +++++++++++++++----------
 src/components/Sing/SequencerNote.vue  |  98 ++--
 src/components/Sing/SequencerRuler.vue |   2 +
 src/components/Sing/ToolBar.vue        |   4 +-
 src/helpers/singHelper.ts              |  14 +-
 src/store/singing.ts                   |  83 ++--
 src/store/type.ts                      |  26 +-
 tests/unit/store/Vuex.spec.ts          |   6 +-
 8 files changed, 470 insertions(+), 421 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 9fdf6b1ff6..dfef6f43a4 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -18,10 +18,10 @@
     <div
       ref="sequencerBody"
       class="sequencer-body"
-      @mousedown="handleMouseDown"
-      @mousemove="handleMouseMove"
-      @mouseup="handleMouseUp"
-      @dblclick="addNote"
+      @mousedown="startPreview($event, 'ADD')"
+      @mousemove="onMouseMove"
+      @mouseup="onMouseUp"
+      @dblclick="onDoubleClick"
       @wheel="onWheel"
       @scroll="onScroll"
     >
@@ -92,16 +92,22 @@
         />
       </svg>
       <sequencer-note
-        v-for="(note, index) in notes"
-        :key="index"
+        v-for="note in unselectedNotes"
+        :key="note.id"
         :note="note"
-        :index="index"
-        :cursor-x="cursorX"
-        :cursor-y="cursorY"
-        @handleNotesKeydown="handleNotesKeydown"
-        @handleDragMoveStart="handleDragMoveStart"
-        @handleDragRightStart="handleDragRightStart"
-        @handleDragLeftStart="handleDragLeftStart"
+        @body-mousedown="startPreview($event, 'MOVE', note)"
+        @right-edge-mousedown="startPreview($event, 'RESIZE_RIGHT', note)"
+        @left-edge-mousedown="startPreview($event, 'RESIZE_LEFT', note)"
+      />
+      <sequencer-note
+        v-for="note in nowPreviewing ? previewNotes : selectedNotes"
+        :key="note.id"
+        :note="note"
+        is-selected
+        :is-preview="nowPreviewing"
+        @body-mousedown="startPreview($event, 'MOVE', note)"
+        @right-edge-mousedown="startPreview($event, 'RESIZE_RIGHT', note)"
+        @left-edge-mousedown="startPreview($event, 'RESIZE_LEFT', note)"
       />
     </div>
     <div
@@ -192,6 +198,8 @@ import {
 } from "@/helpers/singHelper";
 import { Note } from "@/store/type";
 
+type PreviewMode = "ADD" | "MOVE" | "RESIZE_RIGHT" | "RESIZE_LEFT";
+
 export default defineComponent({
   name: "SingScoreSequencer",
   components: {
@@ -201,24 +209,8 @@ export default defineComponent({
     SequencerPhraseIndicator,
   },
   setup() {
-    enum DragMode {
-      NONE = "NONE",
-      MOVE = "MOVE",
-      NOTE_RIGHT = "NOTE_RIGHT",
-      NOTE_LEFT = "NOTE_LEFT",
-      SELECT = "SELECT",
-    }
     const store = useStore();
     const state = store.state;
-    // カーソルポジション
-    const cursorX = ref(0);
-    const cursorY = ref(0);
-    // ドラッグ状態
-    const dragMode = ref<DragMode>(DragMode.NONE);
-    const dragId = ref(0);
-    const dragMoveCurrentX = ref();
-    const dragMoveCurrentY = ref();
-    const dragDurationCurrentX = ref();
     // 分解能（Ticks Per Quarter Note）
     const tpqn = computed(() => state.score.tpqn);
     // ノート
@@ -234,15 +226,11 @@ export default defineComponent({
     const snapTicks = computed(() => {
       return getNoteDuration(state.sequencerSnapType, tpqn.value);
     });
-    const snapBaseWidth = computed(() => {
-      return tickToBaseX(snapTicks.value, tpqn.value);
-    });
-    const snapWidth = computed(() => {
-      return snapBaseWidth.value * zoomX.value;
-    });
     // シーケンサグリッド
     const gridCellTicks = snapTicks; // ひとまずスナップ幅＝グリッドセル幅
-    const gridCellBaseWidth = snapBaseWidth;
+    const gridCellBaseWidth = computed(() => {
+      return tickToBaseX(gridCellTicks.value, tpqn.value);
+    });
     const gridCellWidth = computed(() => {
       return gridCellBaseWidth.value * zoomX.value;
     });
@@ -294,8 +282,12 @@ export default defineComponent({
       const baseX = tickToBaseX(playheadTicks.value, tpqn.value);
       return Math.floor(baseX * zoomX.value);
     });
+    const unselectedNotes = computed(() => {
+      const selectedNoteIds = state.selectedNoteIds;
+      return notes.value.filter((value) => !selectedNoteIds.has(value.id));
+    });
     const selectedNotes = computed(() => {
-      const selectedNoteIds = new Set(state.selectedNoteIds);
+      const selectedNoteIds = state.selectedNoteIds;
       return notes.value.filter((value) => selectedNoteIds.has(value.id));
     });
     const phraseInfos = computed(() => {
@@ -308,256 +300,336 @@ export default defineComponent({
       });
     });
     const scrollBarWidth = ref(12);
-
     const sequencerBody = ref<HTMLElement | null>(null);
 
-    // ノートの追加
-    const addNote = (event: MouseEvent) => {
-      const eventOffsetBaseX = event.offsetX / zoomX.value;
-      const eventOffsetBaseY = event.offsetY / zoomY.value;
-      const positionBaseX =
-        gridCellBaseWidth.value *
-        Math.floor(eventOffsetBaseX / gridCellBaseWidth.value);
-      const position = baseXToTick(positionBaseX, tpqn.value);
-      const noteNumber = baseYToNoteNumber(eventOffsetBaseY);
-      if (noteNumber < 0) {
-        return;
+    // プレビュー
+    // FIXME: 関連する値を１つのobjectにまとめる
+    const nowPreviewing = ref(false);
+    const previewNotes = ref<Note[]>([]);
+    const copiedNotesForPreview = new Map<string, Note>();
+    let previewMode: PreviewMode = "ADD";
+    let previewRequestId = 0;
+    let currentCursorX = 0;
+    let currentCursorY = 0;
+    let dragStartTicks = 0;
+    let dragStartNoteNumber = 0;
+    let draggingNoteId = ""; // FIXME: 無効状態はstring以外の型にする
+    let edited = false;
+    // ダブルクリック
+    const clickedNoteIds: [string | undefined, string | undefined] = [
+      undefined,
+      undefined,
+    ];
+    let cancelDoubleClick = false;
+
+    const previewAdd = () => {
+      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
+      const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
+      const draggingNote = copiedNotesForPreview.get(draggingNoteId);
+      if (!draggingNote) {
+        throw new Error("draggingNote is undefined.");
+      }
+      const noteEndPos = draggingNote.position + draggingNote.duration;
+      const newNoteEndPos =
+        Math.round(cursorTicks / snapTicks.value) * snapTicks.value;
+      const movingTicks = newNoteEndPos - noteEndPos;
+
+      const editedNotes = new Map<string, Note>();
+      for (const note of previewNotes.value) {
+        const copiedNote = copiedNotesForPreview.get(note.id);
+        if (!copiedNote) {
+          throw new Error("copiedNote is undefined.");
+        }
+        const notePos = copiedNote.position;
+        const noteEndPos = copiedNote.position + copiedNote.duration;
+        const duration = Math.max(
+          snapTicks.value,
+          noteEndPos + movingTicks - notePos
+        );
+        if (note.duration !== duration) {
+          editedNotes.set(note.id, { ...note, duration });
+        }
       }
-      // NOTE: ノートの長さはスナップをベース（最小の長さは1/8）
-      const noteType = Math.min(8, state.sequencerSnapType);
-      const duration = getNoteDuration(noteType, tpqn.value);
-      const lyric = getDoremiFromNoteNumber(noteNumber);
-      // NOTE: 仮ID
-      const id = uuidv4();
-      store.dispatch("ADD_NOTES", {
-        notes: [{ id, position, noteNumber, duration, lyric }],
-      });
-      store.dispatch("PLAY_PREVIEW_SOUND", {
-        noteNumber,
-        duration: PREVIEW_SOUND_DURATION,
-      });
-    };
-
-    // マウスダウン
-    // 選択中のノートがある場合は選択リセット
-    const handleMouseDown = () => {
-      if (0 < selectedNotes.value.length) {
-        store.dispatch("DESELECT_ALL_NOTES");
+      if (editedNotes.size !== 0) {
+        previewNotes.value = previewNotes.value.map((value) => {
+          return editedNotes.get(value.id) ?? value;
+        });
       }
     };
 
-    // マウス移動
-    // ドラッグ中の場合はカーソル位置を保持
-    const handleMouseMove = (event: MouseEvent) => {
-      if (dragMode.value !== DragMode.NONE) {
-        cursorX.value = event.clientX;
-        cursorY.value = event.clientY;
+    const previewMove = () => {
+      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
+      const cursorBaseY = (scrollY.value + currentCursorY) / zoomY.value;
+      const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
+      const cursorNoteNumber = baseYToNoteNumber(cursorBaseY);
+      const draggingNote = copiedNotesForPreview.get(draggingNoteId);
+      if (!draggingNote) {
+        throw new Error("draggingNote is undefined.");
+      }
+      const dragTicks = cursorTicks - dragStartTicks;
+      const notePos = draggingNote.position;
+      const newNotePos =
+        Math.round((notePos + dragTicks) / snapTicks.value) * snapTicks.value;
+      const movingTicks = newNotePos - notePos;
+      const movingSemitones = cursorNoteNumber - dragStartNoteNumber;
+
+      const editedNotes = new Map<string, Note>();
+      for (const note of previewNotes.value) {
+        const copiedNote = copiedNotesForPreview.get(note.id);
+        if (!copiedNote) {
+          throw new Error("copiedNote is undefined.");
+        }
+        const position = copiedNote.position + movingTicks;
+        const noteNumber = copiedNote.noteNumber + movingSemitones;
+        if (note.position !== position || note.noteNumber !== noteNumber) {
+          editedNotes.set(note.id, { ...note, noteNumber, position });
+        }
+      }
+      for (const note of editedNotes.values()) {
+        if (note.position < 0) {
+          // 左端より前はドラッグしない
+          return;
+        }
+      }
+      if (editedNotes.size !== 0) {
+        previewNotes.value = previewNotes.value.map((value) => {
+          return editedNotes.get(value.id) ?? value;
+        });
+        edited = true;
       }
     };
 
-    // マウスアップ
-    // ドラッグしていた場合はドラッグを終了
-    const handleMouseUp = () => {
-      if (dragMode.value !== DragMode.NONE) {
-        cancelAnimationFrame(dragId.value);
-        dragMode.value = DragMode.NONE;
-
-        if (selectedNotes.value.length === 1) {
-          store.dispatch("PLAY_PREVIEW_SOUND", {
-            noteNumber: selectedNotes.value[0].noteNumber,
-            duration: PREVIEW_SOUND_DURATION,
-          });
+    const previewResizeRight = () => {
+      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
+      const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
+      const draggingNote = copiedNotesForPreview.get(draggingNoteId);
+      if (!draggingNote) {
+        throw new Error("draggingNote is undefined.");
+      }
+      const dragTicks = cursorTicks - dragStartTicks;
+      const noteEndPos = draggingNote.position + draggingNote.duration;
+      const newNoteEndPos =
+        Math.round((noteEndPos + dragTicks) / snapTicks.value) *
+        snapTicks.value;
+      const movingTicks = newNoteEndPos - noteEndPos;
+
+      const editedNotes = new Map<string, Note>();
+      for (const note of previewNotes.value) {
+        const copiedNote = copiedNotesForPreview.get(note.id);
+        if (!copiedNote) {
+          throw new Error("copiedNote is undefined.");
         }
+        const notePos = copiedNote.position;
+        const noteEndPos = copiedNote.position + copiedNote.duration;
+        const duration = Math.max(
+          snapTicks.value,
+          noteEndPos + movingTicks - notePos
+        );
+        if (note.duration !== duration) {
+          editedNotes.set(note.id, { ...note, duration });
+        }
+      }
+      if (editedNotes.size !== 0) {
+        previewNotes.value = previewNotes.value.map((value) => {
+          return editedNotes.get(value.id) ?? value;
+        });
+        edited = true;
       }
     };
 
-    // ドラッグでのノートの移動
-    const dragMove = () => {
-      if (dragMode.value !== DragMode.MOVE) {
-        cancelAnimationFrame(dragId.value);
-        return;
-      }
-      // X方向, Y方向の移動距離
-      const distanceX = cursorX.value - dragMoveCurrentX.value;
-      const distanceY = cursorY.value - dragMoveCurrentY.value;
-
-      // カーソル位置に応じてノート移動量を計算
-      let amountPositionX = 0;
-      if (gridCellWidth.value <= Math.abs(distanceX)) {
-        amountPositionX = 0 < distanceX ? snapTicks.value : -snapTicks.value;
-        const dragMoveCurrentXNext =
-          dragMoveCurrentX.value +
-          (0 < amountPositionX ? gridCellWidth.value : -gridCellWidth.value);
-        dragMoveCurrentX.value = dragMoveCurrentXNext;
-      }
-      let amountPositionY = 0;
-      if (gridCellHeight.value <= Math.abs(distanceY)) {
-        amountPositionY = 0 < distanceY ? -1 : 1;
-        const dragMoveCurrentYNext =
-          dragMoveCurrentY.value +
-          (0 > amountPositionY ? gridCellHeight.value : -gridCellHeight.value);
-        dragMoveCurrentY.value = dragMoveCurrentYNext;
-      }
-
-      // 選択中のノートのpositionとnoteNumberを変更
-      const editedNotes: Note[] = [];
-      for (const note of selectedNotes.value) {
-        if (amountPositionX === 0 && amountPositionY === 0) {
-          continue;
+    const previewResizeLeft = () => {
+      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
+      const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
+      const draggingNote = copiedNotesForPreview.get(draggingNoteId);
+      if (!draggingNote) {
+        throw new Error("draggingNote is undefined.");
+      }
+      const dragTicks = cursorTicks - dragStartTicks;
+      const notePos = draggingNote.position;
+      const newNotePos =
+        Math.round((notePos + dragTicks) / snapTicks.value) * snapTicks.value;
+      const movingTicks = newNotePos - notePos;
+
+      const editedNotes = new Map<string, Note>();
+      for (const note of previewNotes.value) {
+        const copiedNote = copiedNotesForPreview.get(note.id);
+        if (!copiedNote) {
+          throw new Error("copiedNote is undefined.");
+        }
+        const notePos = copiedNote.position;
+        const noteEndPos = copiedNote.position + copiedNote.duration;
+        const position = Math.min(
+          noteEndPos - snapTicks.value,
+          notePos + movingTicks
+        );
+        const duration = noteEndPos - position;
+        if (note.position !== position && note.duration !== duration) {
+          editedNotes.set(note.id, { ...note, position, duration });
         }
-        const position = note.position + amountPositionX;
-        const noteNumber = note.noteNumber + amountPositionY;
-        editedNotes.push({ ...note, noteNumber, position });
       }
-
-      // 左端より前はドラッグしない
-      if (editedNotes.some((note) => note.position < 0)) {
-        dragId.value = requestAnimationFrame(dragMove);
-        return;
+      for (const note of editedNotes.values()) {
+        if (note.position < 0) {
+          // 左端より前はドラッグしない
+          return;
+        }
       }
-      if (editedNotes.length !== 0) {
-        store.dispatch("UPDATE_NOTES", { notes: editedNotes });
+      if (editedNotes.size !== 0) {
+        previewNotes.value = previewNotes.value.map((value) => {
+          return editedNotes.get(value.id) ?? value;
+        });
+        edited = true;
       }
-      dragId.value = requestAnimationFrame(dragMove);
     };
 
-    // ノートドラッグ開始
-    const handleDragMoveStart = (event: MouseEvent) => {
-      if (selectedNotes.value.length > 0) {
-        dragMode.value = DragMode.MOVE;
-        setTimeout(() => {
-          dragMoveCurrentX.value = event.clientX;
-          dragMoveCurrentY.value = event.clientY;
-          dragId.value = requestAnimationFrame(dragMove);
-        }, 360);
+    const preview = () => {
+      if (previewMode === "ADD") {
+        previewAdd();
       }
-    };
-
-    // ノート右ドラッグ
-    // FIXME: 左右ドラッグロジックを統一する
-    const dragRight = () => {
-      if (dragMode.value !== DragMode.NOTE_RIGHT) {
-        cancelAnimationFrame(dragId.value);
-        return;
+      if (previewMode === "MOVE") {
+        previewMove();
       }
-      const distanceX = cursorX.value - dragDurationCurrentX.value;
-      if (snapWidth.value <= Math.abs(distanceX)) {
-        const editedNotes: Note[] = [];
-        for (const note of selectedNotes.value) {
-          const duration =
-            note.duration +
-            (0 < distanceX ? snapTicks.value : -snapTicks.value);
-          if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
-            continue;
-          }
-          editedNotes.push({ ...note, duration });
-        }
-        const dragDurationCurrentXNext =
-          dragDurationCurrentX.value +
-          (0 < distanceX ? snapWidth.value : -snapWidth.value);
-        dragDurationCurrentX.value = dragDurationCurrentXNext;
-        dragId.value = requestAnimationFrame(dragRight);
-        if (editedNotes.length !== 0) {
-          store.dispatch("UPDATE_NOTES", { notes: editedNotes });
-        }
+      if (previewMode === "RESIZE_RIGHT") {
+        previewResizeRight();
       }
-      dragId.value = requestAnimationFrame(dragRight);
+      if (previewMode === "RESIZE_LEFT") {
+        previewResizeLeft();
+      }
+      previewRequestId = requestAnimationFrame(preview);
     };
 
-    // ノート右ドラッグ開始
-    const handleDragRightStart = (event: MouseEvent) => {
-      dragMode.value = DragMode.NOTE_RIGHT;
-      setTimeout(() => {
-        dragDurationCurrentX.value = event.clientX;
-        dragId.value = requestAnimationFrame(dragRight);
-      }, 360);
+    const getXInBorderBox = (clientX: number, element: HTMLElement) => {
+      return clientX - element.getBoundingClientRect().left;
     };
 
-    // ノート左ドラッグ
-    // FIXME: 左右ドラッグロジックを統一する
-    const dragLeft = () => {
-      if (dragMode.value !== DragMode.NOTE_LEFT) {
-        cancelAnimationFrame(dragId.value);
-        return;
-      }
-      const distanceX = cursorX.value - dragDurationCurrentX.value;
-      if (snapWidth.value <= Math.abs(distanceX)) {
-        const editedNotes: Note[] = [];
-        for (const note of selectedNotes.value) {
-          const position =
-            note.position +
-            (0 < distanceX ? snapTicks.value : -snapTicks.value);
-          const duration =
-            note.duration +
-            (0 > distanceX ? snapTicks.value : -snapTicks.value);
-          if (duration < Math.max(snapTicks.value, 0) || note.position < 0) {
-            continue;
-          }
-          editedNotes.push({ ...note, position, duration });
-        }
-        const dragDurationCurrentXNext =
-          dragDurationCurrentX.value +
-          (0 < distanceX ? snapWidth.value : -snapWidth.value);
-        dragDurationCurrentX.value = dragDurationCurrentXNext;
-        dragId.value = requestAnimationFrame(dragLeft);
-        if (editedNotes.length !== 0) {
-          store.dispatch("UPDATE_NOTES", { notes: editedNotes });
-        }
-      }
-      dragId.value = requestAnimationFrame(dragLeft);
+    const getYInBorderBox = (clientY: number, element: HTMLElement) => {
+      return clientY - element.getBoundingClientRect().top;
     };
 
-    // ノート左ドラッグ開始
-    const handleDragLeftStart = (event: MouseEvent) => {
-      dragMode.value = DragMode.NOTE_LEFT;
-      setTimeout(() => {
-        dragDurationCurrentX.value = event.clientX;
-        dragId.value = requestAnimationFrame(dragLeft);
-      }, 360);
-    };
-
-    // X軸ズーム
-    const setZoomX = (event: Event) => {
+    const startPreview = (
+      event: MouseEvent,
+      mode: PreviewMode,
+      note?: Note
+    ) => {
+      if (nowPreviewing.value) {
+        // RESIZE_RIGHT・RESIZE_LEFTのあとにADDも発生するので、その場合は無視する
+        // TODO: stopPropagation付けたり、他のイベントではエラーを投げるようにする
+        return;
+      }
       const sequencerBodyElement = sequencerBody.value;
       if (!sequencerBodyElement) {
         throw new Error("sequencerBodyElement is null.");
       }
-      if (event.target instanceof HTMLInputElement) {
-        // 画面の中央を基準に水平方向のズームを行う
-        const oldZoomX = zoomX.value;
-        const newZoomX = Number(event.target.value);
-        const scrollLeft = sequencerBodyElement.scrollLeft;
-        const scrollTop = sequencerBodyElement.scrollTop;
-        const clientWidth = sequencerBodyElement.clientWidth;
-
-        store.dispatch("SET_ZOOM_X", { zoomX: newZoomX }).then(() => {
-          const centerBaseX = (scrollLeft + clientWidth / 2) / oldZoomX;
-          const newScrollLeft = centerBaseX * newZoomX - clientWidth / 2;
-          sequencerBodyElement.scrollTo(newScrollLeft, scrollTop);
+      const cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
+      const cursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
+      if (cursorX >= sequencerBodyElement.clientWidth) {
+        return;
+      }
+      if (cursorY >= sequencerBodyElement.clientHeight) {
+        return;
+      }
+      const cursorBaseX = (scrollX.value + cursorX) / zoomX.value;
+      const cursorBaseY = (scrollY.value + cursorY) / zoomY.value;
+      const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
+      const cursorNoteNumber = baseYToNoteNumber(cursorBaseY);
+      const copiedNotes: Note[] = [];
+      if (mode === "ADD") {
+        if (cursorNoteNumber < 0) {
+          return;
+        }
+        note = {
+          id: uuidv4(),
+          position: Math.round(cursorTicks / snapTicks.value) * snapTicks.value,
+          duration: snapTicks.value,
+          noteNumber: cursorNoteNumber,
+          lyric: getDoremiFromNoteNumber(cursorNoteNumber),
+        };
+        store.dispatch("DESELECT_ALL_NOTES");
+        store.dispatch("PLAY_PREVIEW_SOUND", {
+          noteNumber: note.noteNumber,
+          duration: PREVIEW_SOUND_DURATION,
         });
+        copiedNotes.push(note);
+      } else {
+        if (!note) {
+          throw new Error("note is undefined.");
+        }
+        if (state.selectedNoteIds.has(note.id)) {
+          for (const note of selectedNotes.value) {
+            copiedNotes.push({ ...note });
+          }
+        } else {
+          store.dispatch("DESELECT_ALL_NOTES");
+          store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
+          store.dispatch("PLAY_PREVIEW_SOUND", {
+            noteNumber: note.noteNumber,
+            duration: PREVIEW_SOUND_DURATION,
+          });
+          copiedNotes.push({ ...note });
+        }
       }
+      previewMode = mode;
+      currentCursorX = cursorX;
+      currentCursorY = cursorY;
+      dragStartTicks = cursorTicks;
+      dragStartNoteNumber = cursorNoteNumber;
+      draggingNoteId = note.id;
+      edited = false;
+      if (event.detail === 1) {
+        cancelDoubleClick = false;
+      }
+      copiedNotesForPreview.clear();
+      for (const copiedNote of copiedNotes) {
+        copiedNotesForPreview.set(copiedNote.id, copiedNote);
+      }
+      previewNotes.value = copiedNotes;
+      nowPreviewing.value = true;
+      previewRequestId = requestAnimationFrame(preview);
     };
 
-    // Y軸ズーム
-    const setZoomY = (event: Event) => {
+    const onMouseMove = (event: MouseEvent) => {
+      if (!nowPreviewing.value) {
+        return;
+      }
       const sequencerBodyElement = sequencerBody.value;
       if (!sequencerBodyElement) {
         throw new Error("sequencerBodyElement is null.");
       }
-      if (event.target instanceof HTMLInputElement) {
-        // 画面の中央を基準に垂直方向のズームを行う
-        const oldZoomY = zoomY.value;
-        const newZoomY = Number(event.target.value);
-        const scrollLeft = sequencerBodyElement.scrollLeft;
-        const scrollTop = sequencerBodyElement.scrollTop;
-        const clientHeight = sequencerBodyElement.clientHeight;
+      currentCursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
+      currentCursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
+    };
 
-        store.dispatch("SET_ZOOM_Y", { zoomY: newZoomY }).then(() => {
-          const centerBaseY = (scrollTop + clientHeight / 2) / oldZoomY;
-          const newScrollTop = centerBaseY * newZoomY - clientHeight / 2;
-          sequencerBodyElement.scrollTo(scrollLeft, newScrollTop);
+    const onMouseUp = () => {
+      clickedNoteIds[0] = clickedNoteIds[1];
+      clickedNoteIds[1] = nowPreviewing.value ? draggingNoteId : undefined;
+      if (!nowPreviewing.value) {
+        return;
+      }
+      cancelAnimationFrame(previewRequestId);
+      if (previewMode === "ADD") {
+        store.dispatch("ADD_NOTES", { notes: previewNotes.value });
+        cancelDoubleClick = true;
+      } else if (edited) {
+        store.dispatch("UPDATE_NOTES", { notes: previewNotes.value });
+        cancelDoubleClick = true;
+      }
+      if (previewNotes.value.length === 1) {
+        store.dispatch("PLAY_PREVIEW_SOUND", {
+          noteNumber: previewNotes.value[0].noteNumber,
+          duration: PREVIEW_SOUND_DURATION,
         });
       }
+      nowPreviewing.value = false;
+    };
+
+    const onDoubleClick = () => {
+      if (
+        cancelDoubleClick ||
+        clickedNoteIds[0] !== clickedNoteIds[1] ||
+        clickedNoteIds[1] == undefined
+      ) {
+        return;
+      }
+      store.dispatch("REMOVE_NOTES", { noteIds: [clickedNoteIds[1]] });
     };
 
     // キーボードイベント
@@ -605,6 +677,10 @@ export default defineComponent({
         const position = note.position + snapTicks.value;
         editedNotes.push({ ...note, position });
       }
+      if (editedNotes.length === 0) {
+        // TODO: 例外処理は`UPDATE_NOTES`内に移す？
+        return;
+      }
       store.dispatch("UPDATE_NOTES", { notes: editedNotes });
     };
 
@@ -614,17 +690,28 @@ export default defineComponent({
         const position = note.position - snapTicks.value;
         editedNotes.push({ ...note, position });
       }
-      if (editedNotes.some((note) => note.position < 0)) {
+      if (
+        editedNotes.length === 0 ||
+        editedNotes.some((note) => note.position < 0)
+      ) {
         return;
       }
       store.dispatch("UPDATE_NOTES", { notes: editedNotes });
     };
 
     const handleNotesBackspaceOrDelete = () => {
+      if (state.selectedNoteIds.size === 0) {
+        // TODO: 例外処理は`REMOVE_SELECTED_NOTES`内に移す？
+        return;
+      }
       store.dispatch("REMOVE_SELECTED_NOTES");
     };
 
-    const handleNotesKeydown = (event: KeyboardEvent) => {
+    const handleKeydown = (event: KeyboardEvent) => {
+      // プレビュー中の操作は想定外の挙動をしそうなので防止
+      if (nowPreviewing.value) {
+        return;
+      }
       switch (event.key) {
         case "ArrowUp":
           handleNotesArrowUp();
@@ -649,24 +736,65 @@ export default defineComponent({
       }
     };
 
-    const onWheel = (event: WheelEvent) => {
+    // X軸ズーム
+    const setZoomX = (event: Event) => {
       const sequencerBodyElement = sequencerBody.value;
       if (!sequencerBodyElement) {
         throw new Error("sequencerBodyElement is null.");
       }
-      if (event.ctrlKey) {
-        // マウスカーソル位置を基準に水平方向のズームを行う
+      if (event.target instanceof HTMLInputElement) {
+        // 画面の中央を基準に水平方向のズームを行う
         const oldZoomX = zoomX.value;
+        const newZoomX = Number(event.target.value);
         const scrollLeft = sequencerBodyElement.scrollLeft;
         const scrollTop = sequencerBodyElement.scrollTop;
-        const clientRect = sequencerBodyElement.getBoundingClientRect();
-        // sequencerBody要素のborderとpaddingが0であることを前提にマウスカーソル位置を算出
-        const cursorX = event.clientX - clientRect.left;
+        const clientWidth = sequencerBodyElement.clientWidth;
 
+        store.dispatch("SET_ZOOM_X", { zoomX: newZoomX }).then(() => {
+          const centerBaseX = (scrollLeft + clientWidth / 2) / oldZoomX;
+          const newScrollLeft = centerBaseX * newZoomX - clientWidth / 2;
+          sequencerBodyElement.scrollTo(newScrollLeft, scrollTop);
+        });
+      }
+    };
+
+    // Y軸ズーム
+    const setZoomY = (event: Event) => {
+      const sequencerBodyElement = sequencerBody.value;
+      if (!sequencerBodyElement) {
+        throw new Error("sequencerBodyElement is null.");
+      }
+      if (event.target instanceof HTMLInputElement) {
+        // 画面の中央を基準に垂直方向のズームを行う
+        const oldZoomY = zoomY.value;
+        const newZoomY = Number(event.target.value);
+        const scrollLeft = sequencerBodyElement.scrollLeft;
+        const scrollTop = sequencerBodyElement.scrollTop;
+        const clientHeight = sequencerBodyElement.clientHeight;
+
+        store.dispatch("SET_ZOOM_Y", { zoomY: newZoomY }).then(() => {
+          const centerBaseY = (scrollTop + clientHeight / 2) / oldZoomY;
+          const newScrollTop = centerBaseY * newZoomY - clientHeight / 2;
+          sequencerBodyElement.scrollTo(scrollLeft, newScrollTop);
+        });
+      }
+    };
+
+    const onWheel = (event: WheelEvent) => {
+      const sequencerBodyElement = sequencerBody.value;
+      if (!sequencerBodyElement) {
+        throw new Error("sequencerBodyElement is null.");
+      }
+      if (event.ctrlKey) {
+        // マウスカーソル位置を基準に水平方向のズームを行う
+        const cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
+        const oldZoomX = zoomX.value;
         let newZoomX = zoomX.value;
         newZoomX -= event.deltaY * (ZOOM_X_STEP * 0.01);
         newZoomX = Math.min(ZOOM_X_MAX, newZoomX);
         newZoomX = Math.max(ZOOM_X_MIN, newZoomX);
+        const scrollLeft = sequencerBodyElement.scrollLeft;
+        const scrollTop = sequencerBodyElement.scrollTop;
 
         store.dispatch("SET_ZOOM_X", { zoomX: newZoomX }).then(() => {
           const cursorBaseX = (scrollLeft + cursorX) / oldZoomX;
@@ -727,12 +855,16 @@ export default defineComponent({
       store.dispatch("ADD_PLAYHEAD_POSITION_CHANGE_LISTENER", {
         listener: playheadPositionChangeListener,
       });
+
+      document.addEventListener("keydown", handleKeydown);
     });
 
     onUnmounted(() => {
       store.dispatch("REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER", {
         listener: playheadPositionChangeListener,
       });
+
+      document.removeEventListener("keydown", handleKeydown);
     });
 
     return {
@@ -753,24 +885,22 @@ export default defineComponent({
       notes,
       zoomX,
       zoomY,
-      cursorX,
-      cursorY,
       scrollX,
       scrollY,
       playheadX,
       phraseInfos,
       scrollBarWidth,
       sequencerBody,
+      nowPreviewing,
+      previewNotes,
+      selectedNotes,
+      unselectedNotes,
       setZoomX,
       setZoomY,
-      addNote,
-      handleMouseDown,
-      handleMouseMove,
-      handleMouseUp,
-      handleNotesKeydown,
-      handleDragMoveStart,
-      handleDragRightStart,
-      handleDragLeftStart,
+      onMouseMove,
+      onMouseUp,
+      startPreview,
+      onDoubleClick,
       onWheel,
       onScroll,
     };
@@ -813,10 +943,6 @@ export default defineComponent({
   backface-visibility: hidden;
   overflow: auto;
   position: relative;
-
-  &.move {
-    cursor: move;
-  }
 }
 
 .sequencer-overlay {
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 1e689e3722..b1e5921465 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    :class="classNamesStr"
+    :class="classNames"
     :style="{
       transform: `translate3d(${positionX}px,${positionY}px,0)`,
     }"
@@ -17,10 +17,6 @@
       :width="barWidth"
       xmlns="http://www.w3.org/2000/svg"
       class="sequencer-note-bar"
-      focusable="true"
-      tabindex="0"
-      @dblclick.prevent.stop="removeNote"
-      @keydown.prevent="handleKeydown"
     >
       <g>
         <rect
@@ -28,9 +24,12 @@
           x="0"
           height="100%"
           width="100%"
+          rx="2"
+          ry="2"
           stroke-width="1"
           class="sequencer-note-bar-body"
-          @mousedown.stop="handleMouseDown"
+          :class="{ 'cursor-move': !isPreview }"
+          @mousedown="onBodyMouseDown"
         />
         <rect
           y="-25%"
@@ -38,17 +37,17 @@
           height="150%"
           width="12"
           fill-opacity="0"
-          class="sequencer-note-bar-draghandle"
-          @mousedown.stop="handleDragLeftStart"
+          :class="{ 'cursor-ew-resize': !isPreview }"
+          @mousedown="onLeftEdgeMouseDown"
         />
         <rect
           y="-25%"
-          :x="barWidth - 4"
+          :x="barWidth - 8"
           width="12"
           height="150%"
           fill-opacity="0"
-          class="sequencer-note-bar-draghandle"
-          @mousedown.stop="handleDragRightStart"
+          :class="{ 'cursor-ew-resize': !isPreview }"
+          @mousedown="onRightEdgeMouseDown"
         />
       </g>
     </svg>
@@ -63,25 +62,16 @@ import {
   getKeyBaseHeight,
   tickToBaseX,
   noteNumberToBaseY,
-  PREVIEW_SOUND_DURATION,
 } from "@/helpers/singHelper";
 
 export default defineComponent({
   name: "SingSequencerNote",
   props: {
     note: { type: Object as PropType<Note>, required: true },
-    index: { type: Number, required: true },
-    cursorX: { type: Number },
-    cursorY: { type: Number },
+    isSelected: { type: Boolean },
+    isPreview: { type: Boolean },
   },
-
-  emits: [
-    "handleNotesKeydown",
-    "handleDragMoveStart",
-    "handleDragRightStart",
-    "handleDragLeftStart",
-  ],
-
+  emits: ["bodyMousedown", "rightEdgeMousedown", "leftEdgeMousedown"],
   setup(props, { emit }) {
     const store = useStore();
     const state = store.state;
@@ -104,20 +94,16 @@ export default defineComponent({
       const noteEndBaseX = tickToBaseX(noteEndTicks, tpqn.value);
       return (noteEndBaseX - noteStartBaseX) * zoomX.value;
     });
-    const classNamesStr = computed(() => {
-      if (state.selectedNoteIds.includes(props.note.id)) {
+    const classNames = computed(() => {
+      if (props.isSelected) {
         return "sequencer-note selected";
       }
-      if (state.overlappingNoteIds.includes(props.note.id)) {
+      if (state.overlappingNoteIds.has(props.note.id)) {
         return "sequencer-note overlapping";
       }
       return "sequencer-note";
     });
 
-    const removeNote = () => {
-      store.dispatch("REMOVE_NOTES", { noteIds: [props.note.id] });
-    };
-
     const setLyric = (event: Event) => {
       if (!(event.target instanceof HTMLInputElement)) {
         return;
@@ -128,38 +114,16 @@ export default defineComponent({
       }
     };
 
-    const selectThisNote = () => {
-      store.dispatch("SELECT_NOTES", { noteIds: [props.note.id] });
-      store.dispatch("PLAY_PREVIEW_SOUND", {
-        noteNumber: props.note.noteNumber,
-        duration: PREVIEW_SOUND_DURATION,
-      });
-    };
-
-    const handleKeydown = (event: KeyboardEvent) => {
-      emit("handleNotesKeydown", event);
-    };
-
-    const handleMouseDown = (event: MouseEvent) => {
-      if (!state.selectedNoteIds.includes(props.note.id)) {
-        selectThisNote();
-      } else {
-        emit("handleDragMoveStart", event);
-      }
+    const onBodyMouseDown = (event: MouseEvent) => {
+      emit("bodyMousedown", event);
     };
 
-    const handleDragRightStart = (event: MouseEvent) => {
-      if (!state.selectedNoteIds.includes(props.note.id)) {
-        selectThisNote();
-      }
-      emit("handleDragRightStart", event);
+    const onRightEdgeMouseDown = (event: MouseEvent) => {
+      emit("rightEdgeMousedown", event);
     };
 
-    const handleDragLeftStart = (event: MouseEvent) => {
-      if (!state.selectedNoteIds.includes(props.note.id)) {
-        selectThisNote();
-      }
-      emit("handleDragLeftStart", event);
+    const onLeftEdgeMouseDown = (event: MouseEvent) => {
+      emit("leftEdgeMousedown", event);
     };
 
     return {
@@ -169,13 +133,11 @@ export default defineComponent({
       positionY,
       barHeight,
       barWidth,
-      classNamesStr,
-      removeNote,
+      classNames,
       setLyric,
-      handleKeydown,
-      handleDragRightStart,
-      handleDragLeftStart,
-      handleMouseDown,
+      onBodyMouseDown,
+      onRightEdgeMouseDown,
+      onLeftEdgeMouseDown,
     };
   },
 });
@@ -195,7 +157,6 @@ export default defineComponent({
   &.selected {
     .sequencer-note-bar-body {
       fill: darkorange; // 仮
-      cursor: move;
     }
   }
 
@@ -227,6 +188,7 @@ export default defineComponent({
   display: block;
   position: relative;
 }
+
 .sequencer-note-bar-body {
   fill: colors.$primary;
   stroke: #fff;
@@ -236,7 +198,11 @@ export default defineComponent({
   left: 0;
 }
 
-.sequencer-note-bar-draghandle {
+.cursor-move {
+  cursor: move;
+}
+
+.cursor-ew-resize {
   cursor: ew-resize;
 }
 </style>
diff --git a/src/components/Sing/SequencerRuler.vue b/src/components/Sing/SequencerRuler.vue
index ac8ed663f5..6ec0025c78 100644
--- a/src/components/Sing/SequencerRuler.vue
+++ b/src/components/Sing/SequencerRuler.vue
@@ -139,6 +139,8 @@ export default defineComponent({
     });
 
     const onClick = (event: MouseEvent) => {
+      store.dispatch("DESELECT_ALL_NOTES");
+
       const sequencerRulerElement = sequencerRuler.value;
       if (!sequencerRulerElement) {
         throw new Error("sequencerRulerElement is null.");
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 3d2551d859..30c1c47a30 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -29,7 +29,6 @@
         icon="stop"
         @click="stop"
       ></q-btn>
-      <q-btn flat round class="sing-transport-button" icon="loop"></q-btn>
       <div class="sing-playhead-position">{{ playheadPositionStr }}</div>
       <q-input
         type="number"
@@ -382,7 +381,8 @@ export default defineComponent({
 
 .sing-playhead-position {
   font-size: 18px;
-  margin: 0 4px;
+  margin-left: 14px;
+  margin-right: 4px;
   min-width: 82px;
 }
 
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index f40efed8a0..f0b70192b5 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -1,6 +1,7 @@
 import { Note, Tempo, TimeSignature } from "@/store/type";
 
 export const BEAT_TYPES = [2, 4, 8, 16];
+export const MAX_SNAP_TYPE = 32;
 
 export const DEFAULT_TPQN = 480;
 export const DEFAULT_BPM = 120;
@@ -8,7 +9,7 @@ export const DEFAULT_BEATS = 4;
 export const DEFAULT_BEAT_TYPE = 4;
 
 const BASE_X_PER_QUARTER_NOTE = 120;
-const BASE_Y_PER_NOTE_NUMBER = 30;
+const BASE_Y_PER_SEMITONE = 30;
 
 export const ZOOM_X_MIN = 0.2;
 export const ZOOM_X_MAX = 1;
@@ -115,7 +116,7 @@ export function isTriplet(noteType: number) {
 }
 
 export function getKeyBaseHeight() {
-  return BASE_Y_PER_NOTE_NUMBER;
+  return BASE_Y_PER_SEMITONE;
 }
 
 export function tickToBaseX(ticks: number, tpqn: number) {
@@ -128,21 +129,20 @@ export function baseXToTick(baseX: number, tpqn: number) {
 
 // NOTE: ノート番号が整数のときに、そのノート番号のキーの中央の位置を返します
 export function noteNumberToBaseY(noteNumber: number) {
-  return (127.5 - noteNumber) * BASE_Y_PER_NOTE_NUMBER;
+  return (127.5 - noteNumber) * BASE_Y_PER_SEMITONE;
 }
 
 // NOTE: integerがfalseの場合は、ノート番号のキーの中央の位置が
 //       ちょうどそのノート番号となるように計算します
 export function baseYToNoteNumber(baseY: number, integer = true) {
   return integer
-    ? 127 - Math.floor(baseY / BASE_Y_PER_NOTE_NUMBER)
-    : 127.5 - baseY / BASE_Y_PER_NOTE_NUMBER;
+    ? 127 - Math.floor(baseY / BASE_Y_PER_SEMITONE)
+    : 127.5 - baseY / BASE_Y_PER_SEMITONE;
 }
 
 export function getSnapTypes(tpqn: number) {
-  const maxSnapType = 64;
   return getRepresentableNoteTypes(tpqn).filter((value) => {
-    return value <= maxSnapType;
+    return value <= MAX_SNAP_TYPE;
   });
 }
 
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 68566b4ab0..91c9043169 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -336,10 +336,10 @@ class OverlappingNotesDetector {
   }
 
   getOverlappingNoteIds() {
-    const overlappingNoteIds: string[] = [];
+    const overlappingNoteIds = new Set<string>();
     for (const [noteId, noteInfo] of this.noteInfos) {
       if (noteInfo.overlappingNoteIds.size !== 0) {
-        overlappingNoteIds.push(noteId);
+        overlappingNoteIds.add(noteId);
       }
     }
     return overlappingNoteIds;
@@ -404,11 +404,9 @@ export const singingStoreState: SingingStoreState = {
   isShowSinger: true,
   sequencerZoomX: 0.5,
   sequencerZoomY: 0.75,
-  sequencerScrollY: 60, // Y軸 note number
-  sequencerScrollX: 0, // X軸 tick(仮)
   sequencerSnapType: 16, // スナップタイプ
-  selectedNoteIds: [],
-  overlappingNoteIds: [],
+  selectedNoteIds: new Set(),
+  overlappingNoteIds: new Set(),
   nowPlaying: false,
   volume: 0,
   leftLocatorPosition: 0,
@@ -482,7 +480,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     mutation(state, { score }: { score: Score }) {
       const oldNotes = state.score.notes;
       state.score = score;
-      state.selectedNoteIds = [];
+      state.selectedNoteIds.clear();
       overlappingNotesDetector.removeNotes(oldNotes);
       overlappingNotesDetector.addNotes(score.notes);
       state.overlappingNoteIds =
@@ -654,7 +652,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       const scoreNotes = [...state.score.notes, ...notes];
       scoreNotes.sort((a, b) => a.position - b.position);
       state.score.notes = scoreNotes;
-      state.selectedNoteIds = [...state.selectedNoteIds, ...noteIds];
+      const selectedNoteIds = new Set(state.selectedNoteIds);
+      for (const noteId of noteIds) {
+        selectedNoteIds.add(noteId);
+      }
+      state.selectedNoteIds = selectedNoteIds;
       overlappingNotesDetector.addNotes(notes);
       state.overlappingNoteIds =
         overlappingNotesDetector.getOverlappingNoteIds();
@@ -713,9 +715,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.score.notes = state.score.notes.filter((value) => {
         return !noteIdsSet.has(value.id);
       });
-      state.selectedNoteIds = state.selectedNoteIds.filter((value) => {
-        return !noteIdsSet.has(value);
-      });
+      const selectedNoteIds = new Set(state.selectedNoteIds);
+      for (const noteId of noteIds) {
+        selectedNoteIds.delete(noteId);
+      }
+      state.selectedNoteIds = selectedNoteIds;
       overlappingNotesDetector.removeNotes(notes);
       state.overlappingNoteIds =
         overlappingNotesDetector.getOverlappingNoteIds();
@@ -736,47 +740,41 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  SET_SELECTED_NOTE_IDS: {
+  SELECT_NOTES: {
     mutation(state, { noteIds }: { noteIds: string[] }) {
-      state.selectedNoteIds = noteIds;
+      const selectedNoteIds = new Set(state.selectedNoteIds);
+      for (const noteId of noteIds) {
+        selectedNoteIds.add(noteId);
+      }
+      state.selectedNoteIds = selectedNoteIds;
     },
-  },
-
-  SELECT_NOTES: {
     async action({ state, commit }, { noteIds }: { noteIds: string[] }) {
       const scoreNotes = state.score.notes;
       const existingIds = new Set(scoreNotes.map((value) => value.id));
       if (!noteIds.every((value) => existingIds.has(value))) {
         throw new Error("The note ids are invalid.");
       }
-      const selectedNoteIdsSet = new Set([
-        ...state.selectedNoteIds,
-        ...noteIds,
-      ]);
-      commit("SET_SELECTED_NOTE_IDS", { noteIds: [...selectedNoteIdsSet] });
+      commit("SELECT_NOTES", { noteIds });
     },
   },
 
   DESELECT_ALL_NOTES: {
+    mutation(state) {
+      state.selectedNoteIds = new Set();
+    },
     async action({ commit }) {
-      commit("SET_SELECTED_NOTE_IDS", { noteIds: [] });
+      commit("DESELECT_ALL_NOTES");
     },
   },
 
   REMOVE_SELECTED_NOTES: {
     async action({ state, commit, dispatch }) {
-      commit("REMOVE_NOTES", { noteIds: state.selectedNoteIds });
+      commit("REMOVE_NOTES", { noteIds: [...state.selectedNoteIds] });
 
       dispatch("RENDER");
     },
   },
 
-  SET_OVERLAPPING_NOTE_IDS: {
-    mutation(state, { noteIds }: { noteIds: string[] }) {
-      state.overlappingNoteIds = noteIds;
-    },
-  },
-
   SET_PHRASE: {
     mutation(
       state,
@@ -857,28 +855,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  SET_SCROLL_X: {
-    mutation(state, { scrollX }: { scrollX: number }) {
-      state.sequencerScrollX = scrollX;
-    },
-    async action({ commit }, { scrollX }) {
-      commit("SET_SCROLL_X", {
-        scrollX,
-      });
-    },
-  },
-
-  SET_SCROLL_Y: {
-    mutation(state, { scrollY }: { scrollY: number }) {
-      state.sequencerScrollY = scrollY;
-    },
-    async action({ commit }, { scrollY }) {
-      commit("SET_SCROLL_Y", {
-        scrollY,
-      });
-    },
-  },
-
   TICK_TO_SECOND: {
     getter: (state) => (position) => {
       const tpqn = state.score.tpqn;
@@ -1084,11 +1060,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     async action({ state, getters, commit, dispatch }) {
       const deleteOverlappingNotes = (
         score: Score,
-        overlappingNoteIds: string[]
+        overlappingNoteIds: Set<string>
       ) => {
-        const overlappingNoteIdsSet = new Set(overlappingNoteIds);
         score.notes = score.notes.filter((value) => {
-          return !overlappingNoteIdsSet.has(value.id);
+          return !overlappingNoteIds.has(value.id);
         });
       };
 
diff --git a/src/store/type.ts b/src/store/type.ts
index 6ea5427958..7a3ba77cca 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -773,11 +773,9 @@ export type SingingStoreState = {
   // NOTE: オーディオ再生はボイスと同様もしくは拡張して使う？
   sequencerZoomX: number;
   sequencerZoomY: number;
-  sequencerScrollX: number;
-  sequencerScrollY: number;
   sequencerSnapType: number;
-  selectedNoteIds: string[];
-  overlappingNoteIds: string[];
+  selectedNoteIds: Set<string>;
+  overlappingNoteIds: Set<string>;
   nowPlaying: boolean;
   volume: number;
   leftLocatorPosition: number;
@@ -840,15 +838,13 @@ export type SingingStoreTypes = {
     action(payload: { noteIds: string[] }): void;
   };
 
-  SET_SELECTED_NOTE_IDS: {
-    mutation: { noteIds: string[] };
-  };
-
   SELECT_NOTES: {
+    mutation: { noteIds: string[] };
     action(payload: { noteIds: string[] }): void;
   };
 
   DESELECT_ALL_NOTES: {
+    mutation: undefined;
     action(): void;
   };
 
@@ -856,10 +852,6 @@ export type SingingStoreTypes = {
     action(): void;
   };
 
-  SET_OVERLAPPING_NOTE_IDS: {
-    mutation: { noteIds: string[] };
-  };
-
   SET_PHRASE: {
     mutation: { phraseKey: string; phrase: Phrase };
   };
@@ -895,16 +887,6 @@ export type SingingStoreTypes = {
     action(payload: { zoomY: number }): void;
   };
 
-  SET_SCROLL_X: {
-    mutation: { scrollX: number };
-    action(payload: { scrollX: number }): void;
-  };
-
-  SET_SCROLL_Y: {
-    mutation: { scrollY: number };
-    action(payload: { scrollY: number }): void;
-  };
-
   SET_IS_DRAG: {
     mutation: { isDrag: boolean };
     action(payload: { isDrag: boolean }): void;
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index cb66fc23f7..45ae817b34 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -170,11 +170,9 @@ describe("store/vuex.js test", () => {
         isShowSinger: true,
         sequencerZoomX: 1,
         sequencerZoomY: 1,
-        sequencerScrollX: 0,
-        sequencerScrollY: 60,
         sequencerSnapType: 16,
-        selectedNoteIds: [],
-        overlappingNoteIds: [],
+        selectedNoteIds: new Set(),
+        overlappingNoteIds: new Set(),
         nowPlaying: false,
         volume: 0,
         leftLocatorPosition: 0,

From 4c88e952207a80ef18494ad22deeaa93d5e3ee3c Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sat, 6 Jan 2024 03:53:03 +0900
Subject: [PATCH 41/59] =?UTF-8?q?[project-s]=20=E6=AD=8C=E8=A9=9E=E5=85=A5?=
 =?UTF-8?q?=E5=8A=9B=E5=91=A8=E3=82=8A=E3=81=AE=E5=AE=9F=E8=A3=85=20(#1689?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* SequencerNoteのリファクタリング

* 歌詞周りを変更

* リファクタリング

* 修正

* 修正
---
 src/components/Sing/ScoreSequencer.vue | 142 ++++++++++-----
 src/components/Sing/SequencerNote.vue  | 240 +++++++++++++++----------
 src/store/singing.ts                   |  56 +++---
 src/store/type.ts                      |   6 +
 4 files changed, 285 insertions(+), 159 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index dfef6f43a4..4c4f29d05c 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -18,7 +18,7 @@
     <div
       ref="sequencerBody"
       class="sequencer-body"
-      @mousedown="startPreview($event, 'ADD')"
+      @mousedown="onMouseDown"
       @mousemove="onMouseMove"
       @mouseup="onMouseUp"
       @dblclick="onDoubleClick"
@@ -95,19 +95,20 @@
         v-for="note in unselectedNotes"
         :key="note.id"
         :note="note"
-        @body-mousedown="startPreview($event, 'MOVE', note)"
-        @right-edge-mousedown="startPreview($event, 'RESIZE_RIGHT', note)"
-        @left-edge-mousedown="startPreview($event, 'RESIZE_LEFT', note)"
+        @body-mousedown="onNoteBodyMouseDown($event, note)"
+        @left-edge-mousedown="onNoteLeftEdgeMouseDown($event, note)"
+        @right-edge-mousedown="onNoteRightEdgeMouseDown($event, note)"
+        @lyric-mouse-down="onNoteLyricMouseDown(note)"
       />
       <sequencer-note
         v-for="note in nowPreviewing ? previewNotes : selectedNotes"
         :key="note.id"
         :note="note"
         is-selected
-        :is-preview="nowPreviewing"
-        @body-mousedown="startPreview($event, 'MOVE', note)"
-        @right-edge-mousedown="startPreview($event, 'RESIZE_RIGHT', note)"
-        @left-edge-mousedown="startPreview($event, 'RESIZE_LEFT', note)"
+        @body-mousedown="onNoteBodyMouseDown($event, note)"
+        @left-edge-mousedown="onNoteLeftEdgeMouseDown($event, note)"
+        @right-edge-mousedown="onNoteRightEdgeMouseDown($event, note)"
+        @lyric-mouse-down="onNoteLyricMouseDown(note)"
       />
     </div>
     <div
@@ -200,6 +201,11 @@ import { Note } from "@/store/type";
 
 type PreviewMode = "ADD" | "MOVE" | "RESIZE_RIGHT" | "RESIZE_LEFT";
 
+type ClickedNoteInfo = {
+  id: string;
+  edited: boolean;
+};
+
 export default defineComponent({
   name: "SingScoreSequencer",
   components: {
@@ -316,11 +322,8 @@ export default defineComponent({
     let draggingNoteId = ""; // FIXME: 無効状態はstring以外の型にする
     let edited = false;
     // ダブルクリック
-    const clickedNoteIds: [string | undefined, string | undefined] = [
-      undefined,
-      undefined,
-    ];
-    let cancelDoubleClick = false;
+    let mouseDownNoteId: string | undefined;
+    let clickedNoteInfos: (ClickedNoteInfo | undefined)[] = [];
 
     const previewAdd = () => {
       const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
@@ -544,10 +547,6 @@ export default defineComponent({
           lyric: getDoremiFromNoteNumber(cursorNoteNumber),
         };
         store.dispatch("DESELECT_ALL_NOTES");
-        store.dispatch("PLAY_PREVIEW_SOUND", {
-          noteNumber: note.noteNumber,
-          duration: PREVIEW_SOUND_DURATION,
-        });
         copiedNotes.push(note);
       } else {
         if (!note) {
@@ -573,10 +572,7 @@ export default defineComponent({
       dragStartTicks = cursorTicks;
       dragStartNoteNumber = cursorNoteNumber;
       draggingNoteId = note.id;
-      edited = false;
-      if (event.detail === 1) {
-        cancelDoubleClick = false;
-      }
+      edited = mode === "ADD";
       copiedNotesForPreview.clear();
       for (const copiedNote of copiedNotes) {
         copiedNotesForPreview.set(copiedNote.id, copiedNote);
@@ -586,6 +582,37 @@ export default defineComponent({
       previewRequestId = requestAnimationFrame(preview);
     };
 
+    const onNoteBodyMouseDown = (event: MouseEvent, note: Note) => {
+      startPreview(event, "MOVE", note);
+      mouseDownNoteId = note.id;
+    };
+
+    const onNoteLeftEdgeMouseDown = (event: MouseEvent, note: Note) => {
+      startPreview(event, "RESIZE_LEFT", note);
+      mouseDownNoteId = note.id;
+    };
+
+    const onNoteRightEdgeMouseDown = (event: MouseEvent, note: Note) => {
+      startPreview(event, "RESIZE_RIGHT", note);
+      mouseDownNoteId = note.id;
+    };
+
+    const onNoteLyricMouseDown = (note: Note) => {
+      if (!state.selectedNoteIds.has(note.id)) {
+        store.dispatch("DESELECT_ALL_NOTES");
+        store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
+        store.dispatch("PLAY_PREVIEW_SOUND", {
+          noteNumber: note.noteNumber,
+          duration: PREVIEW_SOUND_DURATION,
+        });
+      }
+      mouseDownNoteId = note.id;
+    };
+
+    const onMouseDown = (event: MouseEvent) => {
+      startPreview(event, "ADD");
+    };
+
     const onMouseMove = (event: MouseEvent) => {
       if (!nowPreviewing.value) {
         return;
@@ -598,38 +625,63 @@ export default defineComponent({
       currentCursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
     };
 
-    const onMouseUp = () => {
-      clickedNoteIds[0] = clickedNoteIds[1];
-      clickedNoteIds[1] = nowPreviewing.value ? draggingNoteId : undefined;
+    const onMouseUp = (event: MouseEvent) => {
+      if (event.detail === 1) {
+        clickedNoteInfos = [];
+      }
+      if (mouseDownNoteId == undefined) {
+        clickedNoteInfos.push(undefined);
+      } else {
+        clickedNoteInfos.push({
+          id: mouseDownNoteId,
+          edited: nowPreviewing.value && edited,
+        });
+        mouseDownNoteId = undefined;
+      }
+
       if (!nowPreviewing.value) {
         return;
       }
       cancelAnimationFrame(previewRequestId);
-      if (previewMode === "ADD") {
-        store.dispatch("ADD_NOTES", { notes: previewNotes.value });
-        cancelDoubleClick = true;
-      } else if (edited) {
-        store.dispatch("UPDATE_NOTES", { notes: previewNotes.value });
-        cancelDoubleClick = true;
-      }
-      if (previewNotes.value.length === 1) {
-        store.dispatch("PLAY_PREVIEW_SOUND", {
-          noteNumber: previewNotes.value[0].noteNumber,
-          duration: PREVIEW_SOUND_DURATION,
-        });
+      if (edited) {
+        if (previewMode === "ADD") {
+          store.dispatch("ADD_NOTES", { notes: previewNotes.value });
+          store.dispatch("SELECT_NOTES", {
+            noteIds: previewNotes.value.map((value) => value.id),
+          });
+        } else {
+          store.dispatch("UPDATE_NOTES", { notes: previewNotes.value });
+        }
+        if (previewNotes.value.length === 1) {
+          store.dispatch("PLAY_PREVIEW_SOUND", {
+            noteNumber: previewNotes.value[0].noteNumber,
+            duration: PREVIEW_SOUND_DURATION,
+          });
+        }
       }
       nowPreviewing.value = false;
     };
 
     const onDoubleClick = () => {
-      if (
-        cancelDoubleClick ||
-        clickedNoteIds[0] !== clickedNoteIds[1] ||
-        clickedNoteIds[1] == undefined
-      ) {
+      if (clickedNoteInfos.length < 2) {
         return;
       }
-      store.dispatch("REMOVE_NOTES", { noteIds: [clickedNoteIds[1]] });
+      if (clickedNoteInfos.some((value) => value?.edited ?? false)) {
+        return;
+      }
+      if (clickedNoteInfos[0] == undefined) {
+        return;
+      }
+      for (let i = 1; i < clickedNoteInfos.length; i++) {
+        if (clickedNoteInfos[i - 1]?.id !== clickedNoteInfos[i]?.id) {
+          return;
+        }
+      }
+
+      const noteId = clickedNoteInfos[0].id;
+      if (state.editingLyricNoteId !== noteId) {
+        store.dispatch("SET_EDITING_LYRIC_NOTE_ID", { noteId });
+      }
     };
 
     // キーボードイベント
@@ -897,9 +949,13 @@ export default defineComponent({
       unselectedNotes,
       setZoomX,
       setZoomY,
+      onNoteBodyMouseDown,
+      onNoteLeftEdgeMouseDown,
+      onNoteRightEdgeMouseDown,
+      onNoteLyricMouseDown,
+      onMouseDown,
       onMouseMove,
       onMouseUp,
-      startPreview,
       onDoubleClick,
       onWheel,
       onScroll,
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index b1e5921465..145384a8b6 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -1,56 +1,33 @@
 <template>
   <div
-    :class="classNames"
+    class="note"
+    :class="{
+      selected: noteState === 'SELECTED',
+      overlapping: noteState === 'OVERLAPPING',
+    }"
     :style="{
+      width: `${width}px`,
+      height: `${height}px`,
       transform: `translate3d(${positionX}px,${positionY}px,0)`,
     }"
   >
-    <!-- NOTE: q-inputへの変更 / 表示面+速度面から、クリック時のみinputを表示に変更予定 -->
+    <div class="note-lyric" @mousedown.stop="onLyricMouseDown">
+      {{ lyric }}
+    </div>
+    <div class="note-bar" @mousedown.stop="onBodyMouseDown">
+      <div class="note-left-edge" @mousedown.stop="onLeftEdgeMouseDown"></div>
+      <div class="note-right-edge" @mousedown.stop="onRightEdgeMouseDown"></div>
+    </div>
     <input
-      type="text"
-      :value="note.lyric"
-      class="sequencer-note-lyric"
-      @input="setLyric"
+      v-if="showLyricInput"
+      v-model.lazy.trim="lyric"
+      v-focus
+      class="note-lyric-input"
+      @mousedown.stop
+      @dblclick.stop
+      @keydown.stop="onLyricInputKeyDown"
+      @blur="onLyricInputBlur"
     />
-    <svg
-      :height="barHeight"
-      :width="barWidth"
-      xmlns="http://www.w3.org/2000/svg"
-      class="sequencer-note-bar"
-    >
-      <g>
-        <rect
-          y="0"
-          x="0"
-          height="100%"
-          width="100%"
-          rx="2"
-          ry="2"
-          stroke-width="1"
-          class="sequencer-note-bar-body"
-          :class="{ 'cursor-move': !isPreview }"
-          @mousedown="onBodyMouseDown"
-        />
-        <rect
-          y="-25%"
-          x="-4"
-          height="150%"
-          width="12"
-          fill-opacity="0"
-          :class="{ 'cursor-ew-resize': !isPreview }"
-          @mousedown="onLeftEdgeMouseDown"
-        />
-        <rect
-          y="-25%"
-          :x="barWidth - 8"
-          width="12"
-          height="150%"
-          fill-opacity="0"
-          :class="{ 'cursor-ew-resize': !isPreview }"
-          @mousedown="onRightEdgeMouseDown"
-        />
-      </g>
-    </svg>
   </div>
 </template>
 
@@ -64,14 +41,23 @@ import {
   noteNumberToBaseY,
 } from "@/helpers/singHelper";
 
+type NoteState = "NORMAL" | "SELECTED" | "OVERLAPPING";
+
 export default defineComponent({
   name: "SingSequencerNote",
+  directives: {
+    focus: { mounted: (el: HTMLElement) => el.focus() },
+  },
   props: {
     note: { type: Object as PropType<Note>, required: true },
     isSelected: { type: Boolean },
-    isPreview: { type: Boolean },
   },
-  emits: ["bodyMousedown", "rightEdgeMousedown", "leftEdgeMousedown"],
+  emits: [
+    "bodyMousedown",
+    "rightEdgeMousedown",
+    "leftEdgeMousedown",
+    "lyricMouseDown",
+  ],
   setup(props, { emit }) {
     const store = useStore();
     const state = store.state;
@@ -86,33 +72,38 @@ export default defineComponent({
       const noteNumber = props.note.noteNumber;
       return noteNumberToBaseY(noteNumber + 0.5) * zoomY.value;
     });
-    const barHeight = computed(() => getKeyBaseHeight() * zoomY.value);
-    const barWidth = computed(() => {
+    const height = computed(() => getKeyBaseHeight() * zoomY.value);
+    const width = computed(() => {
       const noteStartTicks = props.note.position;
       const noteEndTicks = props.note.position + props.note.duration;
       const noteStartBaseX = tickToBaseX(noteStartTicks, tpqn.value);
       const noteEndBaseX = tickToBaseX(noteEndTicks, tpqn.value);
       return (noteEndBaseX - noteStartBaseX) * zoomX.value;
     });
-    const classNames = computed(() => {
+    const noteState = computed((): NoteState => {
       if (props.isSelected) {
-        return "sequencer-note selected";
+        return "SELECTED";
       }
       if (state.overlappingNoteIds.has(props.note.id)) {
-        return "sequencer-note overlapping";
+        return "OVERLAPPING";
       }
-      return "sequencer-note";
+      return "NORMAL";
+    });
+    const lyric = computed({
+      get() {
+        return props.note.lyric;
+      },
+      set(value) {
+        if (!value) {
+          return;
+        }
+        const note: Note = { ...props.note, lyric: value };
+        store.dispatch("UPDATE_NOTES", { notes: [note] });
+      },
+    });
+    const showLyricInput = computed(() => {
+      return state.editingLyricNoteId === props.note.id;
     });
-
-    const setLyric = (event: Event) => {
-      if (!(event.target instanceof HTMLInputElement)) {
-        return;
-      }
-      if (event.target.value) {
-        const lyric = event.target.value;
-        store.dispatch("UPDATE_NOTES", { notes: [{ ...props.note, lyric }] });
-      }
-    };
 
     const onBodyMouseDown = (event: MouseEvent) => {
       emit("bodyMousedown", event);
@@ -126,18 +117,55 @@ export default defineComponent({
       emit("leftEdgeMousedown", event);
     };
 
+    const onLyricMouseDown = (event: MouseEvent) => {
+      emit("lyricMouseDown", event);
+    };
+
+    const onLyricInputKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Tab") {
+        event.preventDefault();
+        const noteId = props.note.id;
+        const notes = state.score.notes;
+        const index = notes.findIndex((value) => value.id === noteId);
+        if (index === -1) {
+          return;
+        }
+        if (event.shiftKey && index - 1 < 0) {
+          return;
+        }
+        if (!event.shiftKey && index + 1 >= notes.length) {
+          return;
+        }
+        const nextNoteId = notes[index + (event.shiftKey ? -1 : 1)].id;
+        store.dispatch("SET_EDITING_LYRIC_NOTE_ID", { noteId: nextNoteId });
+      }
+      if (event.key === "Enter") {
+        store.dispatch("SET_EDITING_LYRIC_NOTE_ID", { noteId: undefined });
+      }
+    };
+
+    const onLyricInputBlur = () => {
+      if (state.editingLyricNoteId === props.note.id) {
+        store.dispatch("SET_EDITING_LYRIC_NOTE_ID", { noteId: undefined });
+      }
+    };
+
     return {
       zoomX,
       zoomY,
       positionX,
       positionY,
-      barHeight,
-      barWidth,
-      classNames,
-      setLyric,
+      height,
+      width,
+      noteState,
+      lyric,
+      showLyricInput,
       onBodyMouseDown,
       onRightEdgeMouseDown,
       onLeftEdgeMouseDown,
+      onLyricMouseDown,
+      onLyricInputKeyDown,
+      onLyricInputBlur,
     };
   },
 });
@@ -147,62 +175,82 @@ export default defineComponent({
 @use '@/styles/variables' as vars;
 @use '@/styles/colors' as colors;
 
-.sequencer-note {
-  backface-visibility: hidden;
+.note {
   position: absolute;
   top: 0;
   left: 0;
-  transform-origin: 0, 0;
 
   &.selected {
-    .sequencer-note-bar-body {
-      fill: darkorange; // 仮
+    // 色は仮
+    .note-bar {
+      background-color: hsl(33, 100%, 50%);
+      border-color: hsl(33, 100%, 78%);
+    }
+
+    .note-lyric {
+      border-color: hsl(33, 100%, 84%);
     }
   }
 
   &.overlapping {
-    .sequencer-note-bar-body {
-      fill: rgba(colors.$primary-rgb, 0.5);
+    .note-bar {
+      background-color: hsl(130, 35%, 85%);
+      border-color: hsl(130, 35%, 90%);
     }
   }
 }
 
-.sequencer-note-lyric {
+.note-lyric {
+  position: absolute;
+  left: 0;
+  bottom: calc(100% - 3px);
+  min-width: 20px;
+  padding: 0 1px 2px;
   background: white;
-  border: 0;
-  border-bottom: 1px solid colors.$primary;
   color: colors.$display;
+  border: 1px solid hsl(130, 35%, 88%);
+  border-radius: 3px;
   font-size: 12px;
   font-weight: bold;
   font-feature-settings: "palt" 1;
   letter-spacing: 0.05em;
-  outline: none;
-  padding: 0;
-  position: absolute;
-  bottom: calc(100% - 1px);
-  left: 0;
-  width: 24px;
+  white-space: nowrap;
+  overflow: hidden;
 }
 
-.sequencer-note-bar {
-  display: block;
-  position: relative;
+.note-bar {
+  position: absolute;
+  width: calc(100% + 1px);
+  height: 100%;
+  background-color: colors.$primary;
+  border: 1px solid hsl(130, 35%, 86%);
+  border-radius: 2px;
+  cursor: move;
 }
 
-.sequencer-note-bar-body {
-  fill: colors.$primary;
-  stroke: #fff;
-  stroke-opacity: 0.5;
-  position: relative;
+.note-left-edge {
+  position: absolute;
   top: 0;
-  left: 0;
+  left: -2px;
+  width: 6px;
+  height: 100%;
+  cursor: ew-resize;
 }
 
-.cursor-move {
-  cursor: move;
+.note-right-edge {
+  position: absolute;
+  top: 0;
+  right: -2px;
+  width: 6px;
+  height: 100%;
+  cursor: ew-resize;
 }
 
-.cursor-ew-resize {
-  cursor: ew-resize;
+.note-lyric-input {
+  position: absolute;
+  top: 1px;
+  width: 40px;
+  border: 1px solid hsl(33, 100%, 73%);
+  border-radius: 3px;
 }
 </style>
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 91c9043169..db081e227b 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -478,10 +478,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   SET_SCORE: {
     mutation(state, { score }: { score: Score }) {
-      const oldNotes = state.score.notes;
-      state.score = score;
+      overlappingNotesDetector.removeNotes(state.score.notes);
+      state.overlappingNoteIds.clear();
+      state.editingLyricNoteId = undefined;
       state.selectedNoteIds.clear();
-      overlappingNotesDetector.removeNotes(oldNotes);
+      state.score = score;
       overlappingNotesDetector.addNotes(score.notes);
       state.overlappingNoteIds =
         overlappingNotesDetector.getOverlappingNoteIds();
@@ -648,15 +649,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   ADD_NOTES: {
     mutation(state, { notes }: { notes: Note[] }) {
-      const noteIds = notes.map((value) => value.id);
       const scoreNotes = [...state.score.notes, ...notes];
       scoreNotes.sort((a, b) => a.position - b.position);
       state.score.notes = scoreNotes;
-      const selectedNoteIds = new Set(state.selectedNoteIds);
-      for (const noteId of noteIds) {
-        selectedNoteIds.add(noteId);
-      }
-      state.selectedNoteIds = selectedNoteIds;
       overlappingNotesDetector.addNotes(notes);
       state.overlappingNoteIds =
         overlappingNotesDetector.getOverlappingNoteIds();
@@ -712,17 +707,21 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       const notes = state.score.notes.filter((value) => {
         return noteIdsSet.has(value.id);
       });
-      state.score.notes = state.score.notes.filter((value) => {
-        return !noteIdsSet.has(value.id);
-      });
-      const selectedNoteIds = new Set(state.selectedNoteIds);
-      for (const noteId of noteIds) {
-        selectedNoteIds.delete(noteId);
-      }
-      state.selectedNoteIds = selectedNoteIds;
       overlappingNotesDetector.removeNotes(notes);
       state.overlappingNoteIds =
         overlappingNotesDetector.getOverlappingNoteIds();
+      if (
+        state.editingLyricNoteId != undefined &&
+        noteIdsSet.has(state.editingLyricNoteId)
+      ) {
+        state.editingLyricNoteId = undefined;
+      }
+      for (const noteId of noteIds) {
+        state.selectedNoteIds.delete(noteId);
+      }
+      state.score.notes = state.score.notes.filter((value) => {
+        return !noteIdsSet.has(value.id);
+      });
     },
     async action(
       { state, commit, dispatch },
@@ -742,11 +741,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   SELECT_NOTES: {
     mutation(state, { noteIds }: { noteIds: string[] }) {
-      const selectedNoteIds = new Set(state.selectedNoteIds);
       for (const noteId of noteIds) {
-        selectedNoteIds.add(noteId);
+        state.selectedNoteIds.add(noteId);
       }
-      state.selectedNoteIds = selectedNoteIds;
     },
     async action({ state, commit }, { noteIds }: { noteIds: string[] }) {
       const scoreNotes = state.score.notes;
@@ -760,6 +757,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   DESELECT_ALL_NOTES: {
     mutation(state) {
+      state.editingLyricNoteId = undefined;
       state.selectedNoteIds = new Set();
     },
     async action({ commit }) {
@@ -775,6 +773,24 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  SET_EDITING_LYRIC_NOTE_ID: {
+    mutation(state, { noteId }: { noteId?: string }) {
+      if (noteId != undefined && !state.selectedNoteIds.has(noteId)) {
+        state.selectedNoteIds.clear();
+        state.selectedNoteIds.add(noteId);
+      }
+      state.editingLyricNoteId = noteId;
+    },
+    async action({ state, commit }, { noteId }: { noteId?: string }) {
+      const scoreNotes = state.score.notes;
+      const existingIds = new Set(scoreNotes.map((value) => value.id));
+      if (noteId != undefined && !existingIds.has(noteId)) {
+        throw new Error("The note id is invalid.");
+      }
+      commit("SET_EDITING_LYRIC_NOTE_ID", { noteId });
+    },
+  },
+
   SET_PHRASE: {
     mutation(
       state,
diff --git a/src/store/type.ts b/src/store/type.ts
index 7a3ba77cca..d719c6df3f 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -776,6 +776,7 @@ export type SingingStoreState = {
   sequencerSnapType: number;
   selectedNoteIds: Set<string>;
   overlappingNoteIds: Set<string>;
+  editingLyricNoteId?: string;
   nowPlaying: boolean;
   volume: number;
   leftLocatorPosition: number;
@@ -852,6 +853,11 @@ export type SingingStoreTypes = {
     action(): void;
   };
 
+  SET_EDITING_LYRIC_NOTE_ID: {
+    mutation: { noteId?: string };
+    action(payload: { noteId?: string }): void;
+  };
+
   SET_PHRASE: {
     mutation: { phraseKey: string; phrase: Phrase };
   };

From b199f3fced13dbc1f628de8bf8e728b8c7d13034 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 7 Jan 2024 05:15:48 +0900
Subject: [PATCH 42/59] =?UTF-8?q?[project-s]=20=E3=82=B7=E3=83=B3=E3=82=BB?=
 =?UTF-8?q?=E5=91=A8=E3=82=8A=E3=81=AE=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?=
 =?UTF-8?q?=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0=20(#1691)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* シンセ周りをリファクタリング

* 修正とリファクタリング

* 修正
---
 src/helpers/singHelper.ts            |  66 +++++++-
 src/infrastructures/AudioRenderer.ts | 217 ++++++++++++---------------
 src/store/singing.ts                 |  26 ++--
 3 files changed, 163 insertions(+), 146 deletions(-)

diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
index f0b70192b5..77d5226bbc 100644
--- a/src/helpers/singHelper.ts
+++ b/src/helpers/singHelper.ts
@@ -20,7 +20,21 @@ export const ZOOM_Y_STEP = 0.05;
 export const PREVIEW_SOUND_DURATION = 0.1;
 
 export function noteNumberToFrequency(noteNumber: number) {
-  return 440 * 2 ** ((noteNumber - 69) / 12);
+  return 440 * Math.pow(2, (noteNumber - 69) / 12);
+}
+
+export function linearToDecibel(linearValue: number) {
+  if (linearValue === 0) {
+    return -1000;
+  }
+  return 20 * Math.log10(linearValue);
+}
+
+export function decibelToLinear(decibelValue: number) {
+  if (decibelValue <= -1000) {
+    return 0;
+  }
+  return Math.pow(10, decibelValue / 20);
 }
 
 // NOTE: 戻り値の単位はtick
@@ -256,11 +270,46 @@ export class FrequentlyUpdatedState<T> {
   }
 }
 
+/**
+ * タイマーです。関数を定期的に実行します。
+ */
+export class Timer {
+  private readonly interval: number;
+  private timeoutId?: number;
+
+  get isStarted() {
+    return this.timeoutId != undefined;
+  }
+
+  /**
+   * @param interval 関数を実行する間隔（ミリ秒）
+   */
+  constructor(interval: number) {
+    this.interval = interval;
+  }
+
+  start(onTick: () => void) {
+    const callback = () => {
+      onTick();
+      this.timeoutId = window.setTimeout(callback, this.interval);
+    };
+    this.timeoutId = window.setTimeout(callback, this.interval);
+  }
+
+  stop() {
+    if (this.timeoutId == undefined) {
+      throw new Error("The timer is not started.");
+    }
+    window.clearTimeout(this.timeoutId);
+    this.timeoutId = undefined;
+  }
+}
+
 /**
  * requestAnimationFrameを使用して関数を定期的に実行します。
- * 関数は、指定した最大フレームレート以下で実行されます。
+ * 関数は、指定された最大フレームレート以下で実行されます。
  */
-export class AnimationFrameRunner {
+export class AnimationTimer {
   private readonly maxFrameTime: number;
   private readonly maxDiff: number;
 
@@ -269,16 +318,19 @@ export class AnimationFrameRunner {
   private diff = 0;
 
   get isStarted() {
-    return this.requestId !== undefined;
+    return this.requestId != undefined;
   }
 
+  /**
+   * @param maxFrameRate 最大フレームレート（フレーム毎秒）
+   */
   constructor(maxFrameRate = 60) {
     this.maxFrameTime = 1000 / maxFrameRate;
     this.maxDiff = this.maxFrameTime * 10;
   }
 
   start(onAnimationFrame: () => void) {
-    if (this.requestId !== undefined) {
+    if (this.requestId != undefined) {
       throw new Error("The animation frame runner is already started.");
     }
 
@@ -286,7 +338,7 @@ export class AnimationFrameRunner {
     this.prevTimeStamp = undefined;
 
     const callback = (timeStamp: number) => {
-      if (this.prevTimeStamp === undefined) {
+      if (this.prevTimeStamp == undefined) {
         this.diff += this.maxFrameTime;
       } else {
         this.diff += timeStamp - this.prevTimeStamp;
@@ -303,7 +355,7 @@ export class AnimationFrameRunner {
   }
 
   stop() {
-    if (this.requestId === undefined) {
+    if (this.requestId == undefined) {
       throw new Error("The animation frame runner is not started.");
     }
     window.cancelAnimationFrame(this.requestId);
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 80efa8204b..57499ecd97 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -1,31 +1,16 @@
-/**
- * スケジューリングで使用するタイマーです。
- */
-class Timer {
-  private timeoutId?: number;
-
-  /**
-   * @param interval 関数の呼び出し間隔（ミリ秒）
-   * @param callback 呼び出される関数
-   */
-  constructor(interval: number, callback: () => void) {
-    const tick = () => {
-      callback();
-      this.timeoutId = window.setTimeout(tick, interval);
-    };
-    tick();
-  }
-
-  /**
-   * 破棄します。
-   */
-  dispose() {
-    if (this.timeoutId !== undefined) {
-      window.clearTimeout(this.timeoutId);
-      this.timeoutId = undefined;
-    }
-  }
-}
+import {
+  Timer,
+  decibelToLinear,
+  linearToDecibel,
+  noteNumberToFrequency,
+} from "@/helpers/singHelper";
+
+const getEarliestSchedulableContextTime = (audioContext: BaseAudioContext) => {
+  const renderQuantumSize = 128;
+  const sampleRate = audioContext.sampleRate;
+  const currentTime = audioContext.currentTime;
+  return currentTime + (renderQuantumSize + 10) / sampleRate;
+};
 
 export type AudioSequence = {
   readonly type: "audio";
@@ -48,7 +33,7 @@ export type Sequence = AudioSequence | NoteSequence;
 interface EventScheduler {
   /**
    * スケジューリングを開始します。
-   * @param contextTime スケジューリングを開始する時刻（コンテキスト時間）
+   * @param contextTime スケジューリングを開始する時刻（コンテキスト時刻）
    * @param time スケジューリングの開始位置
    */
   start(contextTime: number, time: number): void;
@@ -61,7 +46,7 @@ interface EventScheduler {
 
   /**
    * スケジューリングを停止します。
-   * @param contextTime スケジューリングを停止する時刻（コンテキスト時間）
+   * @param contextTime スケジューリングを停止する時刻（コンテキスト時刻）
    */
   stop(contextTime: number): void;
 }
@@ -127,7 +112,8 @@ export class Transport {
 
     this.audioContext = audioContext;
     this.scheduleAheadTime = scheduleAheadTime;
-    this.timer = new Timer(lookahead * 1000, () => {
+    this.timer = new Timer(lookahead * 1000);
+    this.timer.start(() => {
       if (this._state === "started") {
         this.schedule(this.audioContext.currentTime);
       }
@@ -153,7 +139,7 @@ export class Transport {
 
   /**
    * スケジューリングを行います。
-   * @param contextTime スケジューリングを行う時刻（コンテキスト時間）
+   * @param contextTime スケジューリングを行う時刻（コンテキスト時刻）
    */
   private schedule(contextTime: number) {
     // 再生位置を計算
@@ -249,7 +235,7 @@ export class Transport {
     if (this.state === "started") {
       this.stop();
     }
-    this.timer.dispose();
+    this.timer.stop();
   }
 }
 
@@ -341,7 +327,7 @@ class AudioEventScheduler implements EventScheduler {
   /**
    * スケジューリングを開始します。
    * このメソッドは一度しか呼び出せません。
-   * @param contextTime スケジューリングを開始する時刻（コンテキスト時間）
+   * @param contextTime スケジューリングを開始する時刻（コンテキスト時刻）
    * @param time スケジューリングの開始位置
    */
   start(contextTime: number, time: number) {
@@ -390,7 +376,7 @@ class AudioEventScheduler implements EventScheduler {
 
   /**
    * スケジューリングを停止します。
-   * @param contextTime スケジューリングを停止する時刻（コンテキスト時間）
+   * @param contextTime スケジューリングを停止する時刻（コンテキスト時刻）
    */
   stop(contextTime: number) {
     if (!this.isStarted) {
@@ -410,7 +396,7 @@ export interface Instrument {
   /**
    * ノートオンをスケジュールします。
    * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。
-   * @param contextTime ノートオンを行う時刻（コンテキスト時間）
+   * @param contextTime ノートオンを行う時刻（コンテキスト時刻）
    * @param noteNumber MIDIノート番号
    */
   noteOn(contextTime: number, noteNumber: number): void;
@@ -418,7 +404,7 @@ export interface Instrument {
   /**
    * ノートオフをスケジュールします。
    * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。
-   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   * @param contextTime ノートオフを行う時刻（コンテキスト時刻）
    * @param noteNumber MIDIノート番号
    */
   noteOff(contextTime: number, noteNumber: number): void;
@@ -426,9 +412,8 @@ export interface Instrument {
   /**
    * 発音中のすべての音に対して、ノートオフのスケジュールを行います。
    * すでにノートオフがスケジュールされている音の場合は、
-   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
-   * 指定された時刻で再スケジュールを行います。
-   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ再スケジュールを行います。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時刻）
    */
   allNotesOff(contextTime: number): void;
 }
@@ -461,7 +446,7 @@ class NoteEventScheduler implements EventScheduler {
   /**
    * スケジューリングを開始します。
    * このメソッドは一度しか呼び出せません。
-   * @param contextTime スケジューリングを開始する時刻（コンテキスト時間）
+   * @param contextTime スケジューリングを開始する時刻（コンテキスト時刻）
    * @param time スケジューリングの開始位置
    */
   start(contextTime: number, time: number) {
@@ -511,7 +496,7 @@ class NoteEventScheduler implements EventScheduler {
 
   /**
    * スケジューリングを停止します。
-   * @param contextTime スケジューリングを停止する時刻（コンテキスト時間）
+   * @param contextTime スケジューリングを停止する時刻（コンテキスト時刻）
    */
   stop(contextTime: number) {
     if (!this.isStarted) {
@@ -552,7 +537,7 @@ class AudioPlayerVoice {
   /**
    * 音声の再生をスケジュールします。
    * このメソッドは一度しか呼び出せません。
-   * @param contextTime 再生を行う時刻（コンテキスト時間）
+   * @param contextTime 再生を行う時刻（コンテキスト時刻）
    * @param offset オフセット（秒）
    */
   play(contextTime: number, offset: number) {
@@ -566,9 +551,8 @@ class AudioPlayerVoice {
   /**
    * 音声の停止をスケジュールします。
    * すでに停止がスケジュールされている場合は、
-   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
-   * 指定された時刻で再スケジュールを行います。
-   * @param contextTime 停止する時刻（コンテキスト時間）
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ再スケジュールを行います。
+   * @param contextTime 停止する時刻（コンテキスト時刻）
    */
   stop(contextTime: number) {
     if (this.stopContextTime === undefined) {
@@ -607,7 +591,7 @@ export class AudioPlayer {
 
   /**
    * 音声の再生をスケジュールします。
-   * @param contextTime 再生を行う時刻（コンテキスト時間）
+   * @param contextTime 再生を行う時刻（コンテキスト時刻）
    * @param offset オフセット（秒）
    * @param buffer 再生する音声バッファ
    */
@@ -624,9 +608,8 @@ export class AudioPlayer {
   /**
    * 再生中のすべての音声の停止をスケジュールします。
    * すでに停止がスケジュールされている音声の場合は、
-   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
-   * 指定された時刻で再スケジュールを行います。
-   * @param contextTime 停止する時刻（コンテキスト時間）
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ再スケジュールを行います。
+   * @param contextTime 停止する時刻（コンテキスト時刻）
    */
   allStop(contextTime: number) {
     this.voices.forEach((value) => {
@@ -709,69 +692,51 @@ class SynthVoice {
     this.filterNode.connect(this.gainNode);
   }
 
-  private noteNumberToFrequency(noteNumber: number) {
-    return 440 * Math.pow(2, (noteNumber - 69) / 12);
-  }
-
-  private linearToDecibel(linearValue: number) {
-    if (linearValue === 0) {
-      return -1000;
-    }
-    return 20 * Math.log10(linearValue);
-  }
-
   private calcFilterFreq(cutoff: number, keyTrack: number, noteNumber: number) {
     return cutoff * Math.pow(2, ((noteNumber - 60) * keyTrack) / 12);
   }
 
   private calcFilterQ(resonance: number) {
-    return this.linearToDecibel(Math.SQRT1_2) + resonance;
-  }
-
-  private getMinContextTime(audioContext: BaseAudioContext) {
-    if (audioContext instanceof AudioContext) {
-      const renderQuantumSize = 128;
-      const latency = (renderQuantumSize + 10) / audioContext.sampleRate;
-      return audioContext.currentTime + latency;
-    } else {
-      return 0;
-    }
+    return linearToDecibel(Math.SQRT1_2) + resonance;
   }
 
   /**
    * ノートオンをスケジュールします。
-   * @param contextTime ノートオンを行う時刻（コンテキスト時間）
+   * @param contextTime ノートオンを行う時刻（コンテキスト時刻）
    */
   noteOn(contextTime: number) {
-    const minContextTime = this.getMinContextTime(this.audioContext);
-    const t0 = Math.max(minContextTime, contextTime);
     const atk = this.ampParams.attack;
     const dcy = this.ampParams.decay;
     const sus = this.ampParams.sustain;
+    const freq = noteNumberToFrequency(this.noteNumber);
+    const t0 = Math.max(
+      getEarliestSchedulableContextTime(this.audioContext),
+      contextTime
+    );
 
     // アタック、ディケイ、サスティーンのスケジュールを行う
     this.gainNode.gain.setValueAtTime(0, t0);
     this.gainNode.gain.linearRampToValueAtTime(1, t0 + atk);
     this.gainNode.gain.setTargetAtTime(sus, t0 + atk, dcy);
 
-    const freq = this.noteNumberToFrequency(this.noteNumber);
     this.oscNode.frequency.value = freq;
+    this.oscNode.start(t0);
 
-    this.oscNode.start(contextTime);
     this._isActive = true;
   }
 
   /**
    * ノートオフをスケジュールします。
    * すでにノートオフがスケジュールされている場合は、
-   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
-   * 指定された時刻で再スケジュールを行います。
-   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ再スケジュールを行います。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時刻）
    */
   noteOff(contextTime: number) {
-    const minContextTime = this.getMinContextTime(this.audioContext);
-    const t0 = Math.max(minContextTime, contextTime);
     const rel = this.ampParams.release;
+    const t0 = Math.max(
+      getEarliestSchedulableContextTime(this.audioContext),
+      contextTime
+    );
     const stopContextTime = t0 + rel * 4;
 
     if (
@@ -783,8 +748,8 @@ class SynthVoice {
       this.gainNode.gain.setTargetAtTime(0, t0, rel);
 
       this.oscNode.stop(stopContextTime);
-      this._isActive = false;
 
+      this._isActive = false;
       this.stopContextTime = stopContextTime;
     }
   }
@@ -836,51 +801,66 @@ export class PolySynth implements Instrument {
 
   /**
    * ノートオンをスケジュールします。
+   * ノートの長さが指定された場合は、ノートオフもスケジュールします。
    * すでに指定されたノート番号でノートオンがスケジュールされている場合は何も行いません。
-   * @param contextTime ノートオンを行う時刻（コンテキスト時間）
+   * @param contextTime ノートオンを行う時刻（コンテキスト時刻）
    * @param noteNumber MIDIノート番号
+   * @param duration ノートの長さ（秒）
    */
-  noteOn(contextTime: number, noteNumber: number) {
-    const exists = this.voices.some((value) => {
+  noteOn(
+    contextTime: number | "immediately",
+    noteNumber: number,
+    duration?: number
+  ) {
+    let voice = this.voices.find((value) => {
       return value.isActive && value.noteNumber === noteNumber;
     });
-    if (exists) return;
-
-    const voice = new SynthVoice(this.audioContext, {
-      noteNumber,
-      osc: this.oscParams,
-      filter: this.filterParams,
-      amp: this.ampParams,
-    });
-    this.voices = this.voices.filter((value) => {
-      return !value.isStopped;
-    });
-    this.voices.push(voice);
-    voice.output.connect(this.gainNode);
-    voice.noteOn(contextTime);
+    if (contextTime === "immediately") {
+      contextTime = getEarliestSchedulableContextTime(this.audioContext);
+    }
+    if (!voice) {
+      voice = new SynthVoice(this.audioContext, {
+        noteNumber,
+        osc: this.oscParams,
+        filter: this.filterParams,
+        amp: this.ampParams,
+      });
+      voice.output.connect(this.gainNode);
+      voice.noteOn(contextTime);
+
+      this.voices = this.voices.filter((value) => {
+        return !value.isStopped;
+      });
+      this.voices.push(voice);
+    }
+    if (duration !== undefined) {
+      voice.noteOff(contextTime + duration);
+    }
   }
 
   /**
    * ノートオフをスケジュールします。
    * すでに指定されたノート番号でノートオフがスケジュールされている場合は何も行いません。
-   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   * @param contextTime ノートオフを行う時刻（コンテキスト時刻）
    * @param noteNumber MIDIノート番号
    */
-  noteOff(contextTime: number, noteNumber: number) {
+  noteOff(contextTime: number | "immediately", noteNumber: number) {
     const voice = this.voices.find((value) => {
       return value.isActive && value.noteNumber === noteNumber;
     });
-    if (!voice) return;
-
-    voice.noteOff(contextTime);
+    if (contextTime === "immediately") {
+      contextTime = getEarliestSchedulableContextTime(this.audioContext);
+    }
+    if (voice) {
+      voice.noteOff(contextTime);
+    }
   }
 
   /**
    * 発音中のすべての音に対して、ノートオフのスケジュールを行います。
    * すでにノートオフがスケジュールされている音の場合は、
-   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ、
-   * 指定された時刻で再スケジュールを行います。
-   * @param contextTime ノートオフを行う時刻（コンテキスト時間）
+   * 指定された時刻が現在スケジュールされている時刻よりも早い場合にのみ再スケジュールを行います。
+   * @param contextTime ノートオフを行う時刻（コンテキスト時刻）
    */
   allNotesOff(contextTime: number) {
     this.voices.forEach((value) => {
@@ -963,6 +943,9 @@ export class Limiter {
     this.setGainInDecibels(value, this.outputGainNode);
   }
 
+  /**
+   * リリース（秒）
+   */
   get release() {
     return this.compNode.release.value;
   }
@@ -998,29 +981,15 @@ export class Limiter {
     this.correctionGainNode.connect(this.outputGainNode);
   }
 
-  private linearToDecibel(linearValue: number) {
-    if (linearValue === 0) {
-      return -1000;
-    }
-    return 20 * Math.log10(linearValue);
-  }
-
-  private decibelToLinear(decibelValue: number) {
-    if (decibelValue <= -1000) {
-      return 0;
-    }
-    return Math.pow(10, decibelValue / 20);
-  }
-
   private getGainInDecibels(gainNode: GainNode) {
-    return this.linearToDecibel(gainNode.gain.value);
+    return linearToDecibel(gainNode.gain.value);
   }
 
   private setGainInDecibels(value: number, gainNode: GainNode) {
     if (!Number.isFinite(value)) {
       throw new Error("Not a finite number.");
     }
-    gainNode.gain.value = this.decibelToLinear(value);
+    gainNode.gain.value = decibelToLinear(value);
   }
 }
 
diff --git a/src/store/singing.ts b/src/store/singing.ts
index db081e227b..ead53bd3d2 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -42,7 +42,7 @@ import {
   noteNumberToFrequency,
   round,
   FrequentlyUpdatedState,
-  AnimationFrameRunner,
+  AnimationTimer,
 } from "@/helpers/singHelper";
 import { AudioQuery, Mora } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
@@ -378,7 +378,7 @@ const playheadPosition = new FrequentlyUpdatedState(0);
 const overlappingNotesDetector = new OverlappingNotesDetector();
 const phraseDataMap = new Map<string, PhraseData>();
 const phraseAudioBlobCache = new Map<string, Blob>();
-const animationFrameRunner = new AnimationFrameRunner();
+const animationTimer = new AnimationTimer();
 
 export const singingStoreState: SingingStoreState = {
   singer: undefined,
@@ -956,7 +956,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       commit("SET_PLAYBACK_STATE", { nowPlaying: true });
 
       transport.start();
-      animationFrameRunner.start(() => {
+      animationTimer.start(() => {
         playheadPosition.value = getters.GET_PLAYHEAD_POSITION();
       });
     },
@@ -973,7 +973,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       commit("SET_PLAYBACK_STATE", { nowPlaying: false });
 
       transport.stop();
-      animationFrameRunner.stop();
+      animationTimer.stop();
       playheadPosition.value = getters.GET_PLAYHEAD_POSITION();
     },
   },
@@ -1003,11 +1003,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (!previewSynth) {
         throw new Error("previewSynth is undefined.");
       }
-      previewSynth.noteOn(0, noteNumber);
-      if (duration !== undefined) {
-        const contextTime = audioContext.currentTime;
-        previewSynth.noteOff(contextTime + duration, noteNumber);
-      }
+      previewSynth.noteOn("immediately", noteNumber, duration);
     },
   },
 
@@ -1019,7 +1015,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       if (!previewSynth) {
         throw new Error("previewSynth is undefined.");
       }
-      previewSynth.noteOff(0, noteNumber);
+      previewSynth.noteOff("immediately", noteNumber);
     },
   },
 
@@ -1158,7 +1154,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       const logPhonemes = (moras: Mora[]) => {
         const phonemes = moras
           .map((value) => {
-            if (value.consonant === undefined) {
+            if (value.consonant == undefined) {
               return [value.vowel];
             } else {
               return [value.consonant, value.vowel];
@@ -1200,7 +1196,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             const minVowelLength = 0.01;
             const minConsonantLength = 0.02;
             const noteLength = noteOffTime - noteOnTime;
-            if (nextMora && nextMora.consonantLength !== undefined) {
+            if (nextMora && nextMora.consonantLength != undefined) {
               // 母音の後ろに子音がある場合
               mora.vowelLength = noteLength - nextMora.consonantLength;
               if (mora.vowelLength < minVowelLength) {
@@ -1414,7 +1410,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           if (!phrase.query) {
             throw new Error("query is undefined.");
           }
-          if (phrase.startTime === undefined) {
+          if (phrase.startTime == undefined) {
             throw new Error("startTime is undefined.");
           }
           if (!phraseData.blob) {
@@ -1767,7 +1763,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             B: 11,
           };
           const stepChar = stepElement.textContent;
-          if (stepChar === null) {
+          if (stepChar == null) {
             throw new Error("The value is invalid.");
           }
           return stepNumberDict[stepChar];
@@ -2167,7 +2163,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             }
             if (
               !phraseData.blob ||
-              phrase.startTime === undefined ||
+              phrase.startTime == undefined ||
               phrase.state !== "PLAYABLE"
             ) {
               continue;

From 8c06ed436072cdc89c0c3dcac6f92a8a79e5c8cd Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 8 Jan 2024 00:47:23 +0900
Subject: [PATCH 43/59] =?UTF-8?q?[project-s]=20=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E6=95=B4=E7=90=86=20(#1693)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* コードを整理

* 修正、スタイルの変更、コメントの追加
---
 src/components/Sing/ScoreSequencer.vue |  18 +-
 src/components/Sing/SequencerKeys.vue  |   2 +-
 src/components/Sing/SequencerNote.vue  |   7 +-
 src/components/Sing/SequencerRuler.vue |   8 +-
 src/components/Sing/ToolBar.vue        |  14 +-
 src/helpers/singHelper.ts              | 364 -------------------------
 src/infrastructures/AudioRenderer.ts   |   6 +-
 src/sing/domain.ts                     | 258 ++++++++++++++++++
 src/sing/storeHelper.ts                | 172 ++++++++++++
 src/sing/utility.ts                    | 121 ++++++++
 src/sing/viewHelper.ts                 |  99 +++++++
 src/store/singing.ts                   | 313 ++-------------------
 src/views/SingerHome.vue               |  24 +-
 13 files changed, 709 insertions(+), 697 deletions(-)
 delete mode 100644 src/helpers/singHelper.ts
 create mode 100644 src/sing/domain.ts
 create mode 100644 src/sing/storeHelper.ts
 create mode 100644 src/sing/utility.ts
 create mode 100644 src/sing/viewHelper.ts

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 4c4f29d05c..f83ce627a3 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -174,13 +174,13 @@
 import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
 import { v4 as uuidv4 } from "uuid";
 import { useStore } from "@/store";
-import SequencerRuler from "@/components/Sing/SequencerRuler.vue";
-import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
-import SequencerNote from "@/components/Sing/SequencerNote.vue";
-import SequencerPhraseIndicator from "@/components/Sing/SequencerPhraseIndicator.vue";
+import { Note } from "@/store/type";
 import {
   getMeasureDuration,
   getNoteDuration,
+  getNumOfMeasures,
+} from "@/sing/domain";
+import {
   getKeyBaseHeight,
   tickToBaseX,
   baseXToTick,
@@ -188,7 +188,6 @@ import {
   baseYToNoteNumber,
   keyInfos,
   getDoremiFromNoteNumber,
-  getNumOfMeasures,
   ZOOM_X_MIN,
   ZOOM_X_MAX,
   ZOOM_X_STEP,
@@ -196,8 +195,11 @@ import {
   ZOOM_Y_MAX,
   ZOOM_Y_STEP,
   PREVIEW_SOUND_DURATION,
-} from "@/helpers/singHelper";
-import { Note } from "@/store/type";
+} from "@/sing/viewHelper";
+import SequencerRuler from "@/components/Sing/SequencerRuler.vue";
+import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
+import SequencerNote from "@/components/Sing/SequencerNote.vue";
+import SequencerPhraseIndicator from "@/components/Sing/SequencerPhraseIndicator.vue";
 
 type PreviewMode = "ADD" | "MOVE" | "RESIZE_RIGHT" | "RESIZE_LEFT";
 
@@ -320,7 +322,7 @@ export default defineComponent({
     let dragStartTicks = 0;
     let dragStartNoteNumber = 0;
     let draggingNoteId = ""; // FIXME: 無効状態はstring以外の型にする
-    let edited = false;
+    let edited = false; // プレビュー終了時にScoreの変更を行うかどうかを表す変数
     // ダブルクリック
     let mouseDownNoteId: string | undefined;
     let clickedNoteInfos: (ClickedNoteInfo | undefined)[] = [];
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index 991862c3a9..e4bdfeeb17 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -54,7 +54,7 @@
 <script lang="ts">
 import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
 import { useStore } from "@/store";
-import { keyInfos, getKeyBaseHeight } from "@/helpers/singHelper";
+import { keyInfos, getKeyBaseHeight } from "@/sing/viewHelper";
 
 export default defineComponent({
   name: "SingSequencerKeys",
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 145384a8b6..4467daed94 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -39,7 +39,7 @@ import {
   getKeyBaseHeight,
   tickToBaseX,
   noteNumberToBaseY,
-} from "@/helpers/singHelper";
+} from "@/sing/viewHelper";
 
 type NoteState = "NORMAL" | "SELECTED" | "OVERLAPPING";
 
@@ -188,7 +188,7 @@ export default defineComponent({
     }
 
     .note-lyric {
-      border-color: hsl(33, 100%, 84%);
+      border-color: hsl(33, 0%, 90%);
     }
   }
 
@@ -208,14 +208,13 @@ export default defineComponent({
   padding: 0 1px 2px;
   background: white;
   color: colors.$display;
-  border: 1px solid hsl(130, 35%, 88%);
+  border: 1px solid hsl(130, 0%, 90%);
   border-radius: 3px;
   font-size: 12px;
   font-weight: bold;
   font-feature-settings: "palt" 1;
   letter-spacing: 0.05em;
   white-space: nowrap;
-  overflow: hidden;
 }
 
 .note-bar {
diff --git a/src/components/Sing/SequencerRuler.vue b/src/components/Sing/SequencerRuler.vue
index 6ec0025c78..a3a403e4d4 100644
--- a/src/components/Sing/SequencerRuler.vue
+++ b/src/components/Sing/SequencerRuler.vue
@@ -59,12 +59,8 @@
 <script lang="ts">
 import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
 import { useStore } from "@/store";
-import {
-  baseXToTick,
-  getMeasureDuration,
-  getTimeSignaturePositions,
-  tickToBaseX,
-} from "@/helpers/singHelper";
+import { getMeasureDuration, getTimeSignaturePositions } from "@/sing/domain";
+import { baseXToTick, tickToBaseX } from "@/sing/viewHelper";
 
 export default defineComponent({
   name: "SingSequencerRuler",
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 30c1c47a30..a3ee4f97bc 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -40,7 +40,7 @@
         @change="setTempo"
       >
         <template #prepend>
-          <div />
+          <div></div>
         </template>
       </q-input>
       <q-input
@@ -53,7 +53,7 @@
         @change="setTimeSignature"
       >
         <template #prepend>
-          <div />
+          <div></div>
         </template>
       </q-input>
       /
@@ -67,7 +67,7 @@
         @change="setTimeSignature"
       >
         <template #prepend>
-          <div />
+          <div></div>
         </template>
       </q-input>
     </div>
@@ -99,7 +99,8 @@ import {
   onUnmounted,
 } from "vue";
 import { useStore } from "@/store";
-import { BEAT_TYPES, getSnapTypes, isTriplet } from "@/helpers/singHelper";
+import { isTriplet, isValidBeatType } from "@/sing/domain";
+import { getSnapTypes } from "@/sing/storeHelper";
 
 export default defineComponent({
   name: "SingToolBar",
@@ -155,7 +156,7 @@ export default defineComponent({
     };
     const setBeatTypeInputBuffer = (beatTypeStr: string | number | null) => {
       const beatType = Number(beatTypeStr);
-      if (!Number.isInteger(beatType) || !BEAT_TYPES.includes(beatType)) {
+      if (!Number.isInteger(beatType) || !isValidBeatType(beatType)) {
         return;
       }
       beatTypeInputBuffer.value = beatType;
@@ -329,8 +330,9 @@ export default defineComponent({
   padding: 8px 16px;
   width: 100%;
 }
+
 .singer-panel-toggler {
-  border: 2px solid #777;
+  border: 2px solid #aaa;
   border-radius: 50%;
   display: block;
   height: 48px;
diff --git a/src/helpers/singHelper.ts b/src/helpers/singHelper.ts
deleted file mode 100644
index 77d5226bbc..0000000000
--- a/src/helpers/singHelper.ts
+++ /dev/null
@@ -1,364 +0,0 @@
-import { Note, Tempo, TimeSignature } from "@/store/type";
-
-export const BEAT_TYPES = [2, 4, 8, 16];
-export const MAX_SNAP_TYPE = 32;
-
-export const DEFAULT_TPQN = 480;
-export const DEFAULT_BPM = 120;
-export const DEFAULT_BEATS = 4;
-export const DEFAULT_BEAT_TYPE = 4;
-
-const BASE_X_PER_QUARTER_NOTE = 120;
-const BASE_Y_PER_SEMITONE = 30;
-
-export const ZOOM_X_MIN = 0.2;
-export const ZOOM_X_MAX = 1;
-export const ZOOM_X_STEP = 0.05;
-export const ZOOM_Y_MIN = 0.35;
-export const ZOOM_Y_MAX = 1;
-export const ZOOM_Y_STEP = 0.05;
-export const PREVIEW_SOUND_DURATION = 0.1;
-
-export function noteNumberToFrequency(noteNumber: number) {
-  return 440 * Math.pow(2, (noteNumber - 69) / 12);
-}
-
-export function linearToDecibel(linearValue: number) {
-  if (linearValue === 0) {
-    return -1000;
-  }
-  return 20 * Math.log10(linearValue);
-}
-
-export function decibelToLinear(decibelValue: number) {
-  if (decibelValue <= -1000) {
-    return 0;
-  }
-  return Math.pow(10, decibelValue / 20);
-}
-
-// NOTE: 戻り値の単位はtick
-export function getTimeSignaturePositions(
-  timeSignatures: TimeSignature[],
-  tpqn: number
-) {
-  const tsPositions: number[] = [0];
-  for (let i = 0; i < timeSignatures.length - 1; i++) {
-    const ts = timeSignatures[i];
-    const tsPosition = tsPositions[i];
-    const nextTs = timeSignatures[i + 1];
-    const measureDuration = getMeasureDuration(ts.beats, ts.beatType, tpqn);
-    const numOfMeasures = nextTs.measureNumber - ts.measureNumber;
-    const nextTsPosition = tsPosition + measureDuration * numOfMeasures;
-    tsPositions.push(nextTsPosition);
-  }
-  return tsPositions;
-}
-
-export function tickToMeasureNumber(
-  ticks: number,
-  timeSignatures: TimeSignature[],
-  tpqn: number
-) {
-  const tsPositions = getTimeSignaturePositions(timeSignatures, tpqn);
-  const nextTsIndex = tsPositions.findIndex((value) => ticks < value);
-  const lastTsIndex = tsPositions.length - 1;
-  const tsIndex = nextTsIndex !== -1 ? nextTsIndex - 1 : lastTsIndex;
-  const ts = timeSignatures[tsIndex];
-  const tsPosition = tsPositions[tsIndex];
-  const ticksWithinTs = ticks - tsPosition;
-  const measureDuration = getMeasureDuration(ts.beats, ts.beatType, tpqn);
-  return ts.measureNumber + Math.floor(ticksWithinTs / measureDuration);
-}
-
-// NOTE: 戻り値の単位はtick
-export function getMeasureDuration(
-  beats: number,
-  beatType: number,
-  tpqn: number
-) {
-  const wholeNoteDuration = tpqn * 4;
-  return (wholeNoteDuration / beatType) * beats;
-}
-
-export function getNumOfMeasures(
-  notes: Note[],
-  tempos: Tempo[],
-  timeSignatures: TimeSignature[],
-  tpqn: number
-) {
-  const tsPositions = getTimeSignaturePositions(timeSignatures, tpqn);
-  let maxTicks = 0;
-  const lastTsPosition = tsPositions[tsPositions.length - 1];
-  const lastTempoPosition = tempos[tempos.length - 1].position;
-  maxTicks = Math.max(maxTicks, lastTsPosition);
-  maxTicks = Math.max(maxTicks, lastTempoPosition);
-  if (notes.length > 0) {
-    const lastNote = notes[notes.length - 1];
-    const lastNoteEndPosition = lastNote.position + lastNote.duration;
-    maxTicks = Math.max(maxTicks, lastNoteEndPosition);
-  }
-  return tickToMeasureNumber(maxTicks, timeSignatures, tpqn);
-}
-
-// NOTE: 戻り値の単位はtick
-export function getNoteDuration(noteType: number, tpqn: number) {
-  return (tpqn * 4) / noteType;
-}
-
-export function getRepresentableNoteTypes(tpqn: number) {
-  const maxNoteType = 128;
-  const wholeNoteDuration = tpqn * 4;
-  const noteTypes = [1];
-  for (let noteType = 2; noteType <= maxNoteType; noteType *= 2) {
-    if (wholeNoteDuration % noteType !== 0) {
-      break;
-    }
-    noteTypes.push(noteType);
-  }
-  for (let noteType = 3; noteType <= maxNoteType; noteType *= 2) {
-    if (wholeNoteDuration % noteType !== 0) {
-      break;
-    }
-    noteTypes.push(noteType);
-  }
-  return noteTypes;
-}
-
-export function isTriplet(noteType: number) {
-  return noteType % 3 === 0;
-}
-
-export function getKeyBaseHeight() {
-  return BASE_Y_PER_SEMITONE;
-}
-
-export function tickToBaseX(ticks: number, tpqn: number) {
-  return (ticks / tpqn) * BASE_X_PER_QUARTER_NOTE;
-}
-
-export function baseXToTick(baseX: number, tpqn: number) {
-  return (baseX / BASE_X_PER_QUARTER_NOTE) * tpqn;
-}
-
-// NOTE: ノート番号が整数のときに、そのノート番号のキーの中央の位置を返します
-export function noteNumberToBaseY(noteNumber: number) {
-  return (127.5 - noteNumber) * BASE_Y_PER_SEMITONE;
-}
-
-// NOTE: integerがfalseの場合は、ノート番号のキーの中央の位置が
-//       ちょうどそのノート番号となるように計算します
-export function baseYToNoteNumber(baseY: number, integer = true) {
-  return integer
-    ? 127 - Math.floor(baseY / BASE_Y_PER_SEMITONE)
-    : 127.5 - baseY / BASE_Y_PER_SEMITONE;
-}
-
-export function getSnapTypes(tpqn: number) {
-  return getRepresentableNoteTypes(tpqn).filter((value) => {
-    return value <= MAX_SNAP_TYPE;
-  });
-}
-
-export function isValidSnapType(snapType: number, tpqn: number) {
-  return getSnapTypes(tpqn).some((value) => value === snapType);
-}
-
-export function getPitchFromNoteNumber(noteNumber: number) {
-  const mapPitches = [
-    "C",
-    "C#",
-    "D",
-    "D#",
-    "E",
-    "F",
-    "F#",
-    "G",
-    "G#",
-    "A",
-    "A#",
-    "B",
-  ];
-  const pitchPos = noteNumber % 12;
-  return mapPitches[pitchPos];
-}
-
-export function getDoremiFromNoteNumber(noteNumber: number) {
-  const mapPitches = [
-    "ド",
-    "ド",
-    "レ",
-    "レ",
-    "ミ",
-    "ファ",
-    "ファ",
-    "ソ",
-    "ソ",
-    "ラ",
-    "ラ",
-    "シ",
-  ];
-  const pitchPos = noteNumber % 12;
-  return mapPitches[pitchPos];
-}
-
-export function getOctaveFromNoteNumber(noteNumber: number) {
-  return Math.floor(noteNumber / 12) - 1;
-}
-
-export function getKeyColorFromNoteNumber(noteNumber: number) {
-  const mapWhiteKeys = ["C", "D", "E", "F", "G", "A", "B"];
-  const pitch = getPitchFromNoteNumber(noteNumber);
-  return mapWhiteKeys.includes(pitch) ? "white" : "black";
-}
-
-export const keyInfos = [...Array(128)]
-  .map((_, noteNumber) => {
-    const pitch = getPitchFromNoteNumber(noteNumber);
-    const octave = getOctaveFromNoteNumber(noteNumber);
-    const name = `${pitch}${octave}`;
-    const color = getKeyColorFromNoteNumber(noteNumber);
-    return {
-      noteNumber,
-      pitch,
-      octave,
-      name,
-      color,
-    };
-  })
-  .reverse();
-
-export function round(value: number, digits: number) {
-  const powerOf10 = 10 ** digits;
-  return Math.round(value * powerOf10) / powerOf10;
-}
-
-/**
- * 頻繁に変更される値を保持します。
- * 値変更時に実行する関数を登録できます。
- */
-export class FrequentlyUpdatedState<T> {
-  private _value: T;
-  private listeners = new Set<(newValue: T) => void>();
-
-  get value() {
-    return this._value;
-  }
-
-  set value(newValue: T) {
-    this._value = newValue;
-    this.listeners.forEach((listener) => listener(newValue));
-  }
-
-  constructor(initialValue: T) {
-    this._value = initialValue;
-  }
-
-  addValueChangeListener(listener: (newValue: T) => void) {
-    if (this.listeners.has(listener)) {
-      throw new Error("The listener already exists.");
-    }
-    this.listeners.add(listener);
-    listener(this.value);
-  }
-
-  removeValueChangeListener(listener: (newValue: T) => void) {
-    if (!this.listeners.has(listener)) {
-      throw new Error("The listener does not exist.");
-    }
-    this.listeners.delete(listener);
-  }
-}
-
-/**
- * タイマーです。関数を定期的に実行します。
- */
-export class Timer {
-  private readonly interval: number;
-  private timeoutId?: number;
-
-  get isStarted() {
-    return this.timeoutId != undefined;
-  }
-
-  /**
-   * @param interval 関数を実行する間隔（ミリ秒）
-   */
-  constructor(interval: number) {
-    this.interval = interval;
-  }
-
-  start(onTick: () => void) {
-    const callback = () => {
-      onTick();
-      this.timeoutId = window.setTimeout(callback, this.interval);
-    };
-    this.timeoutId = window.setTimeout(callback, this.interval);
-  }
-
-  stop() {
-    if (this.timeoutId == undefined) {
-      throw new Error("The timer is not started.");
-    }
-    window.clearTimeout(this.timeoutId);
-    this.timeoutId = undefined;
-  }
-}
-
-/**
- * requestAnimationFrameを使用して関数を定期的に実行します。
- * 関数は、指定された最大フレームレート以下で実行されます。
- */
-export class AnimationTimer {
-  private readonly maxFrameTime: number;
-  private readonly maxDiff: number;
-
-  private requestId?: number;
-  private prevTimeStamp?: number;
-  private diff = 0;
-
-  get isStarted() {
-    return this.requestId != undefined;
-  }
-
-  /**
-   * @param maxFrameRate 最大フレームレート（フレーム毎秒）
-   */
-  constructor(maxFrameRate = 60) {
-    this.maxFrameTime = 1000 / maxFrameRate;
-    this.maxDiff = this.maxFrameTime * 10;
-  }
-
-  start(onAnimationFrame: () => void) {
-    if (this.requestId != undefined) {
-      throw new Error("The animation frame runner is already started.");
-    }
-
-    this.diff = 0;
-    this.prevTimeStamp = undefined;
-
-    const callback = (timeStamp: number) => {
-      if (this.prevTimeStamp == undefined) {
-        this.diff += this.maxFrameTime;
-      } else {
-        this.diff += timeStamp - this.prevTimeStamp;
-      }
-      this.diff = Math.min(this.maxDiff, this.diff);
-      if (this.diff >= this.maxFrameTime) {
-        this.diff -= this.maxFrameTime;
-        onAnimationFrame();
-      }
-      this.prevTimeStamp = timeStamp;
-      this.requestId = window.requestAnimationFrame(callback);
-    };
-    this.requestId = window.requestAnimationFrame(callback);
-  }
-
-  stop() {
-    if (this.requestId == undefined) {
-      throw new Error("The animation frame runner is not started.");
-    }
-    window.cancelAnimationFrame(this.requestId);
-    this.requestId = undefined;
-  }
-}
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index 57499ecd97..cebae8e94e 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -1,9 +1,9 @@
 import {
-  Timer,
+  noteNumberToFrequency,
   decibelToLinear,
   linearToDecibel,
-  noteNumberToFrequency,
-} from "@/helpers/singHelper";
+} from "@/sing/domain";
+import { Timer } from "@/sing/utility";
 
 const getEarliestSchedulableContextTime = (audioContext: BaseAudioContext) => {
   const renderQuantumSize = 128;
diff --git a/src/sing/domain.ts b/src/sing/domain.ts
new file mode 100644
index 0000000000..25d098c472
--- /dev/null
+++ b/src/sing/domain.ts
@@ -0,0 +1,258 @@
+import { Note, Score, Tempo, TimeSignature } from "@/store/type";
+
+const BEAT_TYPES = [2, 4, 8, 16];
+
+export const isValidTpqn = (tpqn: number) => {
+  return (
+    Number.isInteger(tpqn) &&
+    BEAT_TYPES.every((value) => tpqn % value === 0) &&
+    tpqn % 3 === 0
+  );
+};
+
+export const isValidTempo = (tempo: Tempo) => {
+  return (
+    Number.isInteger(tempo.position) &&
+    Number.isFinite(tempo.bpm) &&
+    tempo.position >= 0 &&
+    tempo.bpm > 0
+  );
+};
+
+export const isValidBeatType = (beatType: number) => {
+  return Number.isInteger(beatType) && BEAT_TYPES.includes(beatType);
+};
+
+export const isValidTimeSignature = (timeSignature: TimeSignature) => {
+  return (
+    Number.isInteger(timeSignature.measureNumber) &&
+    Number.isInteger(timeSignature.beats) &&
+    timeSignature.measureNumber > 0 &&
+    timeSignature.beats > 0 &&
+    isValidBeatType(timeSignature.beatType)
+  );
+};
+
+export const isValidNote = (note: Note) => {
+  return (
+    Number.isInteger(note.position) &&
+    Number.isInteger(note.duration) &&
+    Number.isInteger(note.noteNumber) &&
+    note.position >= 0 &&
+    note.duration > 0 &&
+    note.noteNumber >= 0 &&
+    note.noteNumber <= 127
+  );
+};
+
+export const isValidTempos = (tempos: Tempo[]) => {
+  return (
+    tempos.length > 0 &&
+    tempos[0].position === 0 &&
+    tempos.every((value) => isValidTempo(value))
+  );
+};
+
+export const isValidTimeSignatures = (timeSignatures: TimeSignature[]) => {
+  return (
+    timeSignatures.length > 0 &&
+    timeSignatures[0].measureNumber === 1 &&
+    timeSignatures.every((value) => isValidTimeSignature(value))
+  );
+};
+
+export const isValidNotes = (notes: Note[]) => {
+  return notes.every((value) => isValidNote(value));
+};
+
+export const isValidScore = (score: Score) => {
+  return (
+    isValidTpqn(score.tpqn) &&
+    isValidTempos(score.tempos) &&
+    isValidTimeSignatures(score.timeSignatures) &&
+    isValidNotes(score.notes)
+  );
+};
+
+export function noteNumberToFrequency(noteNumber: number) {
+  return 440 * Math.pow(2, (noteNumber - 69) / 12);
+}
+
+export function linearToDecibel(linearValue: number) {
+  if (linearValue === 0) {
+    return -1000;
+  }
+  return 20 * Math.log10(linearValue);
+}
+
+export function decibelToLinear(decibelValue: number) {
+  if (decibelValue <= -1000) {
+    return 0;
+  }
+  return Math.pow(10, decibelValue / 20);
+}
+
+const tickToSecondForConstantBpm = (
+  ticks: number,
+  bpm: number,
+  tpqn: number
+) => {
+  const quarterNotesPerMinute = bpm;
+  const quarterNotesPerSecond = quarterNotesPerMinute / 60;
+  return ticks / tpqn / quarterNotesPerSecond;
+};
+
+const secondToTickForConstantBpm = (
+  seconds: number,
+  bpm: number,
+  tpqn: number
+) => {
+  const quarterNotesPerMinute = bpm;
+  const quarterNotesPerSecond = quarterNotesPerMinute / 60;
+  return seconds * quarterNotesPerSecond * tpqn;
+};
+
+export const tickToSecond = (ticks: number, tempos: Tempo[], tpqn: number) => {
+  let timeOfTempo = 0;
+  let tempo = tempos[tempos.length - 1];
+  for (let i = 0; i < tempos.length; i++) {
+    if (i === tempos.length - 1) {
+      break;
+    }
+    if (tempos[i + 1].position > ticks) {
+      tempo = tempos[i];
+      break;
+    }
+    timeOfTempo += tickToSecondForConstantBpm(
+      tempos[i + 1].position - tempos[i].position,
+      tempos[i].bpm,
+      tpqn
+    );
+  }
+  return (
+    timeOfTempo +
+    tickToSecondForConstantBpm(ticks - tempo.position, tempo.bpm, tpqn)
+  );
+};
+
+export const secondToTick = (
+  seconds: number,
+  tempos: Tempo[],
+  tpqn: number
+) => {
+  let timeOfTempo = 0;
+  let tempo = tempos[tempos.length - 1];
+  for (let i = 0; i < tempos.length; i++) {
+    if (i === tempos.length - 1) {
+      break;
+    }
+    const timeOfNextTempo =
+      timeOfTempo +
+      tickToSecondForConstantBpm(
+        tempos[i + 1].position - tempos[i].position,
+        tempos[i].bpm,
+        tpqn
+      );
+    if (timeOfNextTempo > seconds) {
+      tempo = tempos[i];
+      break;
+    }
+    timeOfTempo = timeOfNextTempo;
+  }
+  return (
+    tempo.position +
+    secondToTickForConstantBpm(seconds - timeOfTempo, tempo.bpm, tpqn)
+  );
+};
+
+// NOTE: 戻り値の単位はtick
+export function getTimeSignaturePositions(
+  timeSignatures: TimeSignature[],
+  tpqn: number
+) {
+  const tsPositions: number[] = [0];
+  for (let i = 0; i < timeSignatures.length - 1; i++) {
+    const ts = timeSignatures[i];
+    const tsPosition = tsPositions[i];
+    const nextTs = timeSignatures[i + 1];
+    const measureDuration = getMeasureDuration(ts.beats, ts.beatType, tpqn);
+    const numOfMeasures = nextTs.measureNumber - ts.measureNumber;
+    const nextTsPosition = tsPosition + measureDuration * numOfMeasures;
+    tsPositions.push(nextTsPosition);
+  }
+  return tsPositions;
+}
+
+export function tickToMeasureNumber(
+  ticks: number,
+  timeSignatures: TimeSignature[],
+  tpqn: number
+) {
+  const tsPositions = getTimeSignaturePositions(timeSignatures, tpqn);
+  const nextTsIndex = tsPositions.findIndex((value) => ticks < value);
+  const lastTsIndex = tsPositions.length - 1;
+  const tsIndex = nextTsIndex !== -1 ? nextTsIndex - 1 : lastTsIndex;
+  const ts = timeSignatures[tsIndex];
+  const tsPosition = tsPositions[tsIndex];
+  const ticksWithinTs = ticks - tsPosition;
+  const measureDuration = getMeasureDuration(ts.beats, ts.beatType, tpqn);
+  return ts.measureNumber + Math.floor(ticksWithinTs / measureDuration);
+}
+
+// NOTE: 戻り値の単位はtick
+export function getMeasureDuration(
+  beats: number,
+  beatType: number,
+  tpqn: number
+) {
+  const wholeNoteDuration = tpqn * 4;
+  return (wholeNoteDuration / beatType) * beats;
+}
+
+export function getNumOfMeasures(
+  notes: Note[],
+  tempos: Tempo[],
+  timeSignatures: TimeSignature[],
+  tpqn: number
+) {
+  const tsPositions = getTimeSignaturePositions(timeSignatures, tpqn);
+  let maxTicks = 0;
+  const lastTsPosition = tsPositions[tsPositions.length - 1];
+  const lastTempoPosition = tempos[tempos.length - 1].position;
+  maxTicks = Math.max(maxTicks, lastTsPosition);
+  maxTicks = Math.max(maxTicks, lastTempoPosition);
+  if (notes.length > 0) {
+    const lastNote = notes[notes.length - 1];
+    const lastNoteEndPosition = lastNote.position + lastNote.duration;
+    maxTicks = Math.max(maxTicks, lastNoteEndPosition);
+  }
+  return tickToMeasureNumber(maxTicks, timeSignatures, tpqn);
+}
+
+// NOTE: 戻り値の単位はtick
+export function getNoteDuration(noteType: number, tpqn: number) {
+  return (tpqn * 4) / noteType;
+}
+
+export function getRepresentableNoteTypes(tpqn: number) {
+  const maxNoteType = 128;
+  const wholeNoteDuration = tpqn * 4;
+  const noteTypes = [1];
+  for (let noteType = 2; noteType <= maxNoteType; noteType *= 2) {
+    if (wholeNoteDuration % noteType !== 0) {
+      break;
+    }
+    noteTypes.push(noteType);
+  }
+  for (let noteType = 3; noteType <= maxNoteType; noteType *= 2) {
+    if (wholeNoteDuration % noteType !== 0) {
+      break;
+    }
+    noteTypes.push(noteType);
+  }
+  return noteTypes;
+}
+
+export function isTriplet(noteType: number) {
+  return noteType % 3 === 0;
+}
diff --git a/src/sing/storeHelper.ts b/src/sing/storeHelper.ts
new file mode 100644
index 0000000000..bc47172824
--- /dev/null
+++ b/src/sing/storeHelper.ts
@@ -0,0 +1,172 @@
+import { Note, Score, Singer } from "@/store/type";
+import { getRepresentableNoteTypes } from "@/sing/domain";
+import { generateHash } from "@/sing/utility";
+
+export const MAX_SNAP_TYPE = 32;
+
+export const DEFAULT_TPQN = 480;
+export const DEFAULT_BPM = 120;
+export const DEFAULT_BEATS = 4;
+export const DEFAULT_BEAT_TYPE = 4;
+
+export function getSnapTypes(tpqn: number) {
+  return getRepresentableNoteTypes(tpqn).filter((value) => {
+    return value <= MAX_SNAP_TYPE;
+  });
+}
+
+export function isValidSnapType(snapType: number, tpqn: number) {
+  return getSnapTypes(tpqn).some((value) => value === snapType);
+}
+
+export const copyScore = (score: Score): Score => {
+  return {
+    tpqn: score.tpqn,
+    tempos: score.tempos.map((value) => ({ ...value })),
+    timeSignatures: score.timeSignatures.map((value) => ({ ...value })),
+    notes: score.notes.map((value) => ({ ...value })),
+  };
+};
+
+export const copySinger = (singer?: Singer): Singer | undefined => {
+  if (!singer) {
+    return undefined;
+  }
+  return {
+    engineId: singer.engineId,
+    styleId: singer.styleId,
+  };
+};
+
+export const generateSingerAndScoreHash = async (obj: {
+  singer: Singer | undefined;
+  score: Score;
+}) => {
+  return generateHash(obj);
+};
+
+/**
+ * 頻繁に変更される値を保持します。
+ * 値変更時に実行する関数を登録できます。
+ */
+export class FrequentlyUpdatedState<T> {
+  private _value: T;
+  private listeners = new Set<(newValue: T) => void>();
+
+  get value() {
+    return this._value;
+  }
+
+  set value(newValue: T) {
+    this._value = newValue;
+    this.listeners.forEach((listener) => listener(newValue));
+  }
+
+  constructor(initialValue: T) {
+    this._value = initialValue;
+  }
+
+  addValueChangeListener(listener: (newValue: T) => void) {
+    if (this.listeners.has(listener)) {
+      throw new Error("The listener already exists.");
+    }
+    this.listeners.add(listener);
+    listener(this.value);
+  }
+
+  removeValueChangeListener(listener: (newValue: T) => void) {
+    if (!this.listeners.has(listener)) {
+      throw new Error("The listener does not exist.");
+    }
+    this.listeners.delete(listener);
+  }
+}
+
+type NoteInfo = {
+  startTicks: number;
+  endTicks: number;
+  overlappingNoteIds: Set<string>;
+};
+
+/**
+ * 重なっているノートを検出します。
+ */
+export class OverlappingNotesDetector {
+  private readonly noteInfos = new Map<string, NoteInfo>();
+
+  addNotes(notes: Note[]) {
+    for (const note of notes) {
+      this.noteInfos.set(note.id, {
+        startTicks: note.position,
+        endTicks: note.position + note.duration,
+        overlappingNoteIds: new Set<string>(),
+      });
+    }
+    // TODO: 計算量がO(n^2)になっているので、区間木などを使用してO(nlogn)にする
+    for (const note of notes) {
+      const overlappingNoteIds = new Set<string>();
+      for (const [noteId, noteInfo] of this.noteInfos) {
+        if (noteId === note.id) {
+          continue;
+        }
+        if (noteInfo.startTicks >= note.position + note.duration) {
+          continue;
+        }
+        if (noteInfo.endTicks <= note.position) {
+          continue;
+        }
+        overlappingNoteIds.add(noteId);
+      }
+
+      const noteId1 = note.id;
+      const noteInfo1 = this.noteInfos.get(noteId1);
+      if (!noteInfo1) {
+        throw new Error("noteInfo1 is undefined.");
+      }
+      for (const noteId2 of overlappingNoteIds) {
+        const noteInfo2 = this.noteInfos.get(noteId2);
+        if (!noteInfo2) {
+          throw new Error("noteInfo2 is undefined.");
+        }
+        noteInfo2.overlappingNoteIds.add(noteId1);
+        noteInfo1.overlappingNoteIds.add(noteId2);
+      }
+    }
+  }
+
+  removeNotes(notes: Note[]) {
+    for (const note of notes) {
+      const noteId1 = note.id;
+      const noteInfo1 = this.noteInfos.get(noteId1);
+      if (!noteInfo1) {
+        throw new Error("noteInfo1 is undefined.");
+      }
+      for (const noteId2 of noteInfo1.overlappingNoteIds) {
+        const noteInfo2 = this.noteInfos.get(noteId2);
+        if (!noteInfo2) {
+          throw new Error("noteInfo2 is undefined.");
+        }
+        noteInfo2.overlappingNoteIds.delete(noteId1);
+        noteInfo1.overlappingNoteIds.delete(noteId2);
+      }
+    }
+    for (const note of notes) {
+      this.noteInfos.delete(note.id);
+    }
+  }
+
+  updateNotes(notes: Note[]) {
+    this.removeNotes(notes);
+    this.addNotes(notes);
+  }
+
+  getOverlappingNoteIds() {
+    const overlappingNoteIds = new Set<string>();
+    for (const [noteId, noteInfo] of this.noteInfos) {
+      if (noteInfo.overlappingNoteIds.size !== 0) {
+        overlappingNoteIds.add(noteId);
+      }
+    }
+    return overlappingNoteIds;
+  }
+}
diff --git a/src/sing/utility.ts b/src/sing/utility.ts
new file mode 100644
index 0000000000..e4569053c3
--- /dev/null
+++ b/src/sing/utility.ts
@@ -0,0 +1,121 @@
+export function round(value: number, digits: number) {
+  const powerOf10 = 10 ** digits;
+  return Math.round(value * powerOf10) / powerOf10;
+}
+
+export const generateHash = async <T>(obj: T) => {
+  const textEncoder = new TextEncoder();
+  const data = textEncoder.encode(JSON.stringify(obj));
+  const digest = await crypto.subtle.digest("SHA-256", data);
+  return Array.from(new Uint8Array(digest))
+    .map((v) => v.toString(16).padStart(2, "0"))
+    .join("");
+};
+
+export const createPromiseThatResolvesWhen = (
+  condition: () => boolean,
+  interval = 200
+) => {
+  return new Promise<void>((resolve) => {
+    const checkCondition = () => {
+      if (condition()) {
+        resolve();
+      }
+      window.setTimeout(checkCondition, interval);
+    };
+    checkCondition();
+  });
+};
+
+/**
+ * タイマーです。関数を定期的に実行します。
+ */
+export class Timer {
+  private readonly interval: number;
+  private timeoutId?: number;
+
+  get isStarted() {
+    return this.timeoutId != undefined;
+  }
+
+  /**
+   * @param interval 関数を実行する間隔（ミリ秒）
+   */
+  constructor(interval: number) {
+    this.interval = interval;
+  }
+
+  start(onTick: () => void) {
+    const callback = () => {
+      onTick();
+      this.timeoutId = window.setTimeout(callback, this.interval);
+    };
+    this.timeoutId = window.setTimeout(callback, this.interval);
+  }
+
+  stop() {
+    if (this.timeoutId == undefined) {
+      throw new Error("The timer is not started.");
+    }
+    window.clearTimeout(this.timeoutId);
+    this.timeoutId = undefined;
+  }
+}
+
+/**
+ * requestAnimationFrameを使用して関数を定期的に実行します。
+ * 関数は、指定された最大フレームレート以下で実行されます。
+ */
+export class AnimationTimer {
+  private readonly maxFrameTime: number;
+  private readonly maxDiff: number;
+
+  private requestId?: number;
+  private prevTimeStamp?: number;
+  private diff = 0;
+
+  get isStarted() {
+    return this.requestId != undefined;
+  }
+
+  /**
+   * @param maxFrameRate 最大フレームレート（フレーム毎秒）
+   */
+  constructor(maxFrameRate = 60) {
+    this.maxFrameTime = 1000 / maxFrameRate;
+    this.maxDiff = this.maxFrameTime * 10;
+  }
+
+  start(onAnimationFrame: () => void) {
+    if (this.requestId != undefined) {
+      throw new Error("The animation frame runner is already started.");
+    }
+
+    this.diff = 0;
+    this.prevTimeStamp = undefined;
+
+    const callback = (timeStamp: number) => {
+      if (this.prevTimeStamp == undefined) {
+        this.diff += this.maxFrameTime;
+      } else {
+        this.diff += timeStamp - this.prevTimeStamp;
+      }
+      this.diff = Math.min(this.maxDiff, this.diff);
+      if (this.diff >= this.maxFrameTime) {
+        this.diff -= this.maxFrameTime;
+        onAnimationFrame();
+      }
+      this.prevTimeStamp = timeStamp;
+      this.requestId = window.requestAnimationFrame(callback);
+    };
+    this.requestId = window.requestAnimationFrame(callback);
+  }
+
+  stop() {
+    if (this.requestId == undefined) {
+      throw new Error("The animation frame runner is not started.");
+    }
+    window.cancelAnimationFrame(this.requestId);
+    this.requestId = undefined;
+  }
+}
diff --git a/src/sing/viewHelper.ts b/src/sing/viewHelper.ts
new file mode 100644
index 0000000000..4787dcc881
--- /dev/null
+++ b/src/sing/viewHelper.ts
@@ -0,0 +1,99 @@
+const BASE_X_PER_QUARTER_NOTE = 120;
+const BASE_Y_PER_SEMITONE = 30;
+
+export const ZOOM_X_MIN = 0.2;
+export const ZOOM_X_MAX = 1;
+export const ZOOM_X_STEP = 0.05;
+export const ZOOM_Y_MIN = 0.35;
+export const ZOOM_Y_MAX = 1;
+export const ZOOM_Y_STEP = 0.05;
+export const PREVIEW_SOUND_DURATION = 0.1;
+
+export function getKeyBaseHeight() {
+  return BASE_Y_PER_SEMITONE;
+}
+
+export function tickToBaseX(ticks: number, tpqn: number) {
+  return (ticks / tpqn) * BASE_X_PER_QUARTER_NOTE;
+}
+
+export function baseXToTick(baseX: number, tpqn: number) {
+  return (baseX / BASE_X_PER_QUARTER_NOTE) * tpqn;
+}
+
+// NOTE: ノート番号が整数のときに、そのノート番号のキーの中央の位置を返します
+export function noteNumberToBaseY(noteNumber: number) {
+  return (127.5 - noteNumber) * BASE_Y_PER_SEMITONE;
+}
+
+// NOTE: integerがfalseの場合は、ノート番号のキーの中央の位置が
+//       ちょうどそのノート番号となるように計算します
+export function baseYToNoteNumber(baseY: number, integer = true) {
+  return integer
+    ? 127 - Math.floor(baseY / BASE_Y_PER_SEMITONE)
+    : 127.5 - baseY / BASE_Y_PER_SEMITONE;
+}
+
+export function getPitchFromNoteNumber(noteNumber: number) {
+  const mapPitches = [
+    "C",
+    "C#",
+    "D",
+    "D#",
+    "E",
+    "F",
+    "F#",
+    "G",
+    "G#",
+    "A",
+    "A#",
+    "B",
+  ];
+  const pitchPos = noteNumber % 12;
+  return mapPitches[pitchPos];
+}
+
+export function getDoremiFromNoteNumber(noteNumber: number) {
+  const mapPitches = [
+    "ド",
+    "ド",
+    "レ",
+    "レ",
+    "ミ",
+    "ファ",
+    "ファ",
+    "ソ",
+    "ソ",
+    "ラ",
+    "ラ",
+    "シ",
+  ];
+  const pitchPos = noteNumber % 12;
+  return mapPitches[pitchPos];
+}
+
+export function getOctaveFromNoteNumber(noteNumber: number) {
+  return Math.floor(noteNumber / 12) - 1;
+}
+
+export function getKeyColorFromNoteNumber(noteNumber: number) {
+  const mapWhiteKeys = ["C", "D", "E", "F", "G", "A", "B"];
+  const pitch = getPitchFromNoteNumber(noteNumber);
+  return mapWhiteKeys.includes(pitch) ? "white" : "black";
+}
+
+export const keyInfos = [...Array(128)]
+  .map((_, noteNumber) => {
+    const pitch = getPitchFromNoteNumber(noteNumber);
+    const octave = getOctaveFromNoteNumber(noteNumber);
+    const name = `${pitch}${octave}`;
+    const color = getKeyColorFromNoteNumber(noteNumber);
+    return {
+      noteNumber,
+      pitch,
+      octave,
+      name,
+      color,
+    };
+  })
+  .reverse();
diff --git a/src/store/singing.ts b/src/store/singing.ts
index ead53bd3d2..cf22ac3b60 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1,6 +1,8 @@
 import path from "path";
 import { Midi } from "@tonejs/midi";
 import { v4 as uuidv4 } from "uuid";
+import { createPartialStore } from "./vuex";
+import { createUILockAction } from "./ui";
 import {
   Score,
   Tempo,
@@ -13,8 +15,8 @@ import {
   Phrase,
   PhraseState,
 } from "./type";
-import { createPartialStore } from "./vuex";
-import { createUILockAction } from "./ui";
+import { AudioQuery, Mora } from "@/openapi";
+import { ResultError, getValueOrThrow } from "@/type/result";
 import {
   AudioEvent,
   AudioPlayer,
@@ -31,90 +33,33 @@ import {
   Transport,
 } from "@/infrastructures/AudioRenderer";
 import {
-  BEAT_TYPES,
+  getMeasureDuration,
+  isValidNote,
+  isValidScore,
+  isValidTempo,
+  isValidTimeSignature,
+  noteNumberToFrequency,
+  secondToTick,
+  tickToSecond,
+} from "@/sing/domain";
+import {
   DEFAULT_BEATS,
   DEFAULT_BEAT_TYPE,
   DEFAULT_BPM,
   DEFAULT_TPQN,
-  getDoremiFromNoteNumber,
-  getMeasureDuration,
-  isValidSnapType,
-  noteNumberToFrequency,
-  round,
   FrequentlyUpdatedState,
+  OverlappingNotesDetector,
+  copyScore,
+  copySinger,
+  generateSingerAndScoreHash,
+  isValidSnapType,
+} from "@/sing/storeHelper";
+import { getDoremiFromNoteNumber } from "@/sing/viewHelper";
+import {
   AnimationTimer,
-} from "@/helpers/singHelper";
-import { AudioQuery, Mora } from "@/openapi";
-import { ResultError, getValueOrThrow } from "@/type/result";
-
-const tickToSecondForConstantBpm = (
-  ticks: number,
-  bpm: number,
-  tpqn: number
-) => {
-  const quarterNotesPerMinute = bpm;
-  const quarterNotesPerSecond = quarterNotesPerMinute / 60;
-  return ticks / tpqn / quarterNotesPerSecond;
-};
-
-const secondToTickForConstantBpm = (
-  seconds: number,
-  bpm: number,
-  tpqn: number
-) => {
-  const quarterNotesPerMinute = bpm;
-  const quarterNotesPerSecond = quarterNotesPerMinute / 60;
-  return seconds * quarterNotesPerSecond * tpqn;
-};
-
-const tickToSecond = (ticks: number, tempos: Tempo[], tpqn: number) => {
-  let timeOfTempo = 0;
-  let tempo = tempos[tempos.length - 1];
-  for (let i = 0; i < tempos.length; i++) {
-    if (i === tempos.length - 1) {
-      break;
-    }
-    if (tempos[i + 1].position > ticks) {
-      tempo = tempos[i];
-      break;
-    }
-    timeOfTempo += tickToSecondForConstantBpm(
-      tempos[i + 1].position - tempos[i].position,
-      tempos[i].bpm,
-      tpqn
-    );
-  }
-  return (
-    timeOfTempo +
-    tickToSecondForConstantBpm(ticks - tempo.position, tempo.bpm, tpqn)
-  );
-};
-
-const secondToTick = (seconds: number, tempos: Tempo[], tpqn: number) => {
-  let timeOfTempo = 0;
-  let tempo = tempos[tempos.length - 1];
-  for (let i = 0; i < tempos.length; i++) {
-    if (i === tempos.length - 1) {
-      break;
-    }
-    const timeOfNextTempo =
-      timeOfTempo +
-      tickToSecondForConstantBpm(
-        tempos[i + 1].position - tempos[i].position,
-        tempos[i].bpm,
-        tpqn
-      );
-    if (timeOfNextTempo > seconds) {
-      tempo = tempos[i];
-      break;
-    }
-    timeOfTempo = timeOfNextTempo;
-  }
-  return (
-    tempo.position +
-    secondToTickForConstantBpm(seconds - timeOfTempo, tempo.bpm, tpqn)
-  );
-};
+  createPromiseThatResolvesWhen,
+  round,
+} from "@/sing/utility";
 
 const generateAudioEvents = async (
   audioContext: BaseAudioContext,
@@ -138,214 +83,6 @@ const generateNoteEvents = (notes: Note[], tempos: Tempo[], tpqn: number) => {
   });
 };
 
-const copyScore = (score: Score): Score => {
-  return {
-    tpqn: score.tpqn,
-    tempos: score.tempos.map((value) => ({ ...value })),
-    timeSignatures: score.timeSignatures.map((value) => ({ ...value })),
-    notes: score.notes.map((value) => ({ ...value })),
-  };
-};
-
-const copySinger = (singer?: Singer): Singer | undefined => {
-  if (!singer) {
-    return undefined;
-  }
-  return {
-    engineId: singer.engineId,
-    styleId: singer.styleId,
-  };
-};
-
-const _generateHash = async <T>(obj: T) => {
-  const textEncoder = new TextEncoder();
-  const data = textEncoder.encode(JSON.stringify(obj));
-  const digest = await crypto.subtle.digest("SHA-256", data);
-  return Array.from(new Uint8Array(digest))
-    .map((v) => v.toString(16).padStart(2, "0"))
-    .join("");
-};
-
-const createPromiseThatResolvesWhen = (
-  condition: () => boolean,
-  interval = 200
-) => {
-  return new Promise<void>((resolve) => {
-    const checkCondition = () => {
-      if (condition()) {
-        resolve();
-      }
-      window.setTimeout(checkCondition, interval);
-    };
-    checkCondition();
-  });
-};
-
-const generateSingerAndScoreHash = async (obj: {
-  singer: Singer | undefined;
-  score: Score;
-}) => {
-  return _generateHash(obj);
-};
-
-const isValidTpqn = (tpqn: number) => {
-  return (
-    Number.isInteger(tpqn) &&
-    BEAT_TYPES.every((value) => tpqn % value === 0) &&
-    tpqn % 3 === 0
-  );
-};
-
-const isValidTempo = (tempo: Tempo) => {
-  return (
-    Number.isInteger(tempo.position) &&
-    Number.isFinite(tempo.bpm) &&
-    tempo.position >= 0 &&
-    tempo.bpm > 0
-  );
-};
-
-const isValidBeatType = (beatType: number) => {
-  return Number.isInteger(beatType) && BEAT_TYPES.includes(beatType);
-};
-
-const isValidTimeSignature = (timeSignature: TimeSignature) => {
-  return (
-    Number.isInteger(timeSignature.measureNumber) &&
-    Number.isInteger(timeSignature.beats) &&
-    timeSignature.measureNumber > 0 &&
-    timeSignature.beats > 0 &&
-    isValidBeatType(timeSignature.beatType)
-  );
-};
-
-const isValidNote = (note: Note) => {
-  return (
-    Number.isInteger(note.position) &&
-    Number.isInteger(note.duration) &&
-    Number.isInteger(note.noteNumber) &&
-    note.position >= 0 &&
-    note.duration > 0 &&
-    note.noteNumber >= 0 &&
-    note.noteNumber <= 127
-  );
-};
-
-const isValidTempos = (tempos: Tempo[]) => {
-  return (
-    tempos.length > 0 &&
-    tempos[0].position === 0 &&
-    tempos.every((value) => isValidTempo(value))
-  );
-};
-
-const isValidTimeSignatures = (timeSignatures: TimeSignature[]) => {
-  return (
-    timeSignatures.length > 0 &&
-    timeSignatures[0].measureNumber === 1 &&
-    timeSignatures.every((value) => isValidTimeSignature(value))
-  );
-};
-
-const isValidNotes = (notes: Note[]) => {
-  return notes.every((value) => isValidNote(value));
-};
-
-const isValidScore = (score: Score) => {
-  return (
-    isValidTpqn(score.tpqn) &&
-    isValidTempos(score.tempos) &&
-    isValidTimeSignatures(score.timeSignatures) &&
-    isValidNotes(score.notes)
-  );
-};
-
-type NoteInfo = {
-  startTicks: number;
-  endTicks: number;
-  overlappingNoteIds: Set<string>;
-};
-
-class OverlappingNotesDetector {
-  private readonly noteInfos = new Map<string, NoteInfo>();
-
-  addNotes(notes: Note[]) {
-    for (const note of notes) {
-      this.noteInfos.set(note.id, {
-        startTicks: note.position,
-        endTicks: note.position + note.duration,
-        overlappingNoteIds: new Set<string>(),
-      });
-    }
-    // TODO: 計算量がO(n^2)になっているので、区間木などを使用してO(nlogn)にする
-    for (const note of notes) {
-      const overlappingNoteIds = new Set<string>();
-      for (const [noteId, noteInfo] of this.noteInfos) {
-        if (noteId === note.id) {
-          continue;
-        }
-        if (noteInfo.startTicks >= note.position + note.duration) {
-          continue;
-        }
-        if (noteInfo.endTicks <= note.position) {
-          continue;
-        }
-        overlappingNoteIds.add(noteId);
-      }
-
-      const noteId1 = note.id;
-      const noteInfo1 = this.noteInfos.get(noteId1);
-      if (!noteInfo1) {
-        throw new Error("noteInfo1 is undefined.");
-      }
-      for (const noteId2 of overlappingNoteIds) {
-        const noteInfo2 = this.noteInfos.get(noteId2);
-        if (!noteInfo2) {
-          throw new Error("noteInfo2 is undefined.");
-        }
-        noteInfo2.overlappingNoteIds.add(noteId1);
-        noteInfo1.overlappingNoteIds.add(noteId2);
-      }
-    }
-  }
-
-  removeNotes(notes: Note[]) {
-    for (const note of notes) {
-      const noteId1 = note.id;
-      const noteInfo1 = this.noteInfos.get(noteId1);
-      if (!noteInfo1) {
-        throw new Error("noteInfo1 is undefined.");
-      }
-      for (const noteId2 of noteInfo1.overlappingNoteIds) {
-        const noteInfo2 = this.noteInfos.get(noteId2);
-        if (!noteInfo2) {
-          throw new Error("noteInfo2 is undefined.");
-        }
-        noteInfo2.overlappingNoteIds.delete(noteId1);
-        noteInfo1.overlappingNoteIds.delete(noteId2);
-      }
-    }
-    for (const note of notes) {
-      this.noteInfos.delete(note.id);
-    }
-  }
-
-  updateNotes(notes: Note[]) {
-    this.removeNotes(notes);
-    this.addNotes(notes);
-  }
-
-  getOverlappingNoteIds() {
-    const overlappingNoteIds = new Set<string>();
-    for (const [noteId, noteInfo] of this.noteInfos) {
-      if (noteInfo.overlappingNoteIds.size !== 0) {
-        overlappingNoteIds.add(noteId);
-      }
-    }
-    return overlappingNoteIds;
-  }
-}
-
 let audioContext: AudioContext | undefined;
 let transport: Transport | undefined;
 let previewSynth: PolySynth | undefined;
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index a12f7ae4a1..56bb1727c0 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -26,29 +26,19 @@
 </template>
 
 <script lang="ts">
-import {
-  computed,
-  defineComponent,
-  //onBeforeUpdate,
-  onMounted,
-  //ref,
-  //watch,
-} from "vue";
+import { computed, defineComponent, onMounted } from "vue";
 import { useStore } from "@/store";
-// import { QResizeObserver, useQuasar } from "quasar";
-// import path from "path";
-
-import SingerTab from "@/components/SingerTab.vue";
-import MenuBar from "@/components/Sing/MenuBar.vue";
-import ToolBar from "@/components/Sing/ToolBar.vue";
-import SingerPanel from "@/components/Sing/SingerPanel.vue";
-import ScoreSequencer from "@/components/Sing/ScoreSequencer.vue";
 import {
   DEFAULT_BEATS,
   DEFAULT_BEAT_TYPE,
   DEFAULT_BPM,
   DEFAULT_TPQN,
-} from "@/helpers/singHelper";
+} from "@/sing/storeHelper";
+import SingerTab from "@/components/SingerTab.vue";
+import MenuBar from "@/components/Sing/MenuBar.vue";
+import ToolBar from "@/components/Sing/ToolBar.vue";
+import SingerPanel from "@/components/Sing/SingerPanel.vue";
+import ScoreSequencer from "@/components/Sing/ScoreSequencer.vue";
 
 export default defineComponent({
   name: "SingerHome",

From 2ce1c3fdcad43281f0cd749a9494ac3aed04299d Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Tue, 9 Jan 2024 01:05:53 +0900
Subject: [PATCH 44/59] =?UTF-8?q?[project-s]=20=E8=A4=87=E6=95=B0=E9=81=B8?=
 =?UTF-8?q?=E6=8A=9E=E3=82=92=E5=AE=9F=E8=A3=85=20(#1695)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 複数選択を実装

* ノートのダブルクリック判定の処理を前の形に戻す
---
 src/components/Sing/ScoreSequencer.vue | 71 ++++++++++++++------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index f83ce627a3..cc0dab2d26 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -203,11 +203,6 @@ import SequencerPhraseIndicator from "@/components/Sing/SequencerPhraseIndicator
 
 type PreviewMode = "ADD" | "MOVE" | "RESIZE_RIGHT" | "RESIZE_LEFT";
 
-type ClickedNoteInfo = {
-  id: string;
-  edited: boolean;
-};
-
 export default defineComponent({
   name: "SingScoreSequencer",
   components: {
@@ -325,7 +320,11 @@ export default defineComponent({
     let edited = false; // プレビュー終了時にScoreの変更を行うかどうかを表す変数
     // ダブルクリック
     let mouseDownNoteId: string | undefined;
-    let clickedNoteInfos: (ClickedNoteInfo | undefined)[] = [];
+    const clickedNoteIds: [string | undefined, string | undefined] = [
+      undefined,
+      undefined,
+    ];
+    let ignoreDoubleClick = false;
 
     const previewAdd = () => {
       const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
@@ -554,17 +553,35 @@ export default defineComponent({
         if (!note) {
           throw new Error("note is undefined.");
         }
-        if (state.selectedNoteIds.has(note.id)) {
-          for (const note of selectedNotes.value) {
-            copiedNotes.push({ ...note });
+        if (event.shiftKey) {
+          let minIndex = notes.value.length - 1;
+          let maxIndex = 0;
+          for (let i = 0; i < notes.value.length; i++) {
+            const noteId = notes.value[i].id;
+            if (state.selectedNoteIds.has(noteId) || noteId === note.id) {
+              minIndex = Math.min(minIndex, i);
+              maxIndex = Math.max(maxIndex, i);
+            }
           }
-        } else {
+          const noteIdsToSelect: string[] = [];
+          for (let i = minIndex; i <= maxIndex; i++) {
+            const noteId = notes.value[i].id;
+            if (!state.selectedNoteIds.has(noteId)) {
+              noteIdsToSelect.push(noteId);
+            }
+          }
+          store.dispatch("SELECT_NOTES", { noteIds: noteIdsToSelect });
+        } else if (event.ctrlKey) {
+          store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
+        } else if (!state.selectedNoteIds.has(note.id)) {
           store.dispatch("DESELECT_ALL_NOTES");
           store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
           store.dispatch("PLAY_PREVIEW_SOUND", {
             noteNumber: note.noteNumber,
             duration: PREVIEW_SOUND_DURATION,
           });
+        }
+        for (const note of selectedNotes.value) {
           copiedNotes.push({ ...note });
         }
       }
@@ -613,6 +630,7 @@ export default defineComponent({
 
     const onMouseDown = (event: MouseEvent) => {
       startPreview(event, "ADD");
+      mouseDownNoteId = undefined;
     };
 
     const onMouseMove = (event: MouseEvent) => {
@@ -628,17 +646,13 @@ export default defineComponent({
     };
 
     const onMouseUp = (event: MouseEvent) => {
+      clickedNoteIds[0] = clickedNoteIds[1];
+      clickedNoteIds[1] = mouseDownNoteId;
       if (event.detail === 1) {
-        clickedNoteInfos = [];
+        ignoreDoubleClick = false;
       }
-      if (mouseDownNoteId == undefined) {
-        clickedNoteInfos.push(undefined);
-      } else {
-        clickedNoteInfos.push({
-          id: mouseDownNoteId,
-          edited: nowPreviewing.value && edited,
-        });
-        mouseDownNoteId = undefined;
+      if (nowPreviewing.value && edited) {
+        ignoreDoubleClick = true;
       }
 
       if (!nowPreviewing.value) {
@@ -665,22 +679,15 @@ export default defineComponent({
     };
 
     const onDoubleClick = () => {
-      if (clickedNoteInfos.length < 2) {
-        return;
-      }
-      if (clickedNoteInfos.some((value) => value?.edited ?? false)) {
-        return;
-      }
-      if (clickedNoteInfos[0] == undefined) {
+      if (
+        ignoreDoubleClick ||
+        clickedNoteIds[0] !== clickedNoteIds[1] ||
+        clickedNoteIds[1] == undefined
+      ) {
         return;
       }
-      for (let i = 1; i < clickedNoteInfos.length; i++) {
-        if (clickedNoteInfos[i - 1]?.id !== clickedNoteInfos[i]?.id) {
-          return;
-        }
-      }
 
-      const noteId = clickedNoteInfos[0].id;
+      const noteId = clickedNoteIds[1];
       if (state.editingLyricNoteId !== noteId) {
         store.dispatch("SET_EDITING_LYRIC_NOTE_ID", { noteId });
       }

From 51515360c2fad9ae88043ed1c565a2095f4f8ce4 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Wed, 10 Jan 2024 23:20:57 +0900
Subject: [PATCH 45/59] =?UTF-8?q?[project-s]=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=81=8C=E8=BF=BD=E5=8A=A0=E3=81=95=E3=82=8C=E3=82=8B=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0=20(#1704)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ノートが追加される位置を線で表示、修正、色の変更
---
 src/components/Sing/ScoreSequencer.vue | 97 ++++++++++++++++++++------
 src/components/Sing/SequencerNote.vue  | 10 +--
 src/components/Sing/ToolBar.vue        |  2 +-
 3 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index cc0dab2d26..0d8069fdfa 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -22,15 +22,17 @@
       @mousemove="onMouseMove"
       @mouseup="onMouseUp"
       @dblclick="onDoubleClick"
+      @mouseenter="onMouseEnter"
+      @mouseleave="onMouseLeave"
       @wheel="onWheel"
       @scroll="onScroll"
     >
       <!-- グリッド -->
       <!-- NOTE: 現状オクターブごとの罫線なし -->
       <svg
+        xmlns="http://www.w3.org/2000/svg"
         :width="gridWidth"
         :height="gridHeight"
-        xmlns="http://www.w3.org/2000/svg"
         class="sequencer-grid"
       >
         <defs>
@@ -91,6 +93,14 @@
           fill="url(#sequencer-grid-measure)"
         />
       </svg>
+      <div
+        v-if="showGuideLine"
+        class="sequencer-guideline"
+        :style="{
+          height: `${gridHeight}px`,
+          transform: `translateX(${guideLineX}px)`,
+        }"
+      ></div>
       <sequencer-note
         v-for="note in unselectedNotes"
         :key="note.id"
@@ -135,7 +145,6 @@
         }"
       ></div>
     </div>
-    <!-- NOTE: スクロールバー+ズームレンジ仮 -->
     <input
       type="range"
       :min="ZOOM_X_MIN"
@@ -304,7 +313,9 @@ export default defineComponent({
     });
     const scrollBarWidth = ref(12);
     const sequencerBody = ref<HTMLElement | null>(null);
-
+    // マウスカーソル位置
+    let cursorX = 0;
+    let cursorY = 0;
     // プレビュー
     // FIXME: 関連する値を１つのobjectにまとめる
     const nowPreviewing = ref(false);
@@ -312,8 +323,6 @@ export default defineComponent({
     const copiedNotesForPreview = new Map<string, Note>();
     let previewMode: PreviewMode = "ADD";
     let previewRequestId = 0;
-    let currentCursorX = 0;
-    let currentCursorY = 0;
     let dragStartTicks = 0;
     let dragStartNoteNumber = 0;
     let draggingNoteId = ""; // FIXME: 無効状態はstring以外の型にする
@@ -325,9 +334,12 @@ export default defineComponent({
       undefined,
     ];
     let ignoreDoubleClick = false;
+    // ガイドライン
+    const showGuideLine = ref(true);
+    const guideLineX = ref(0);
 
     const previewAdd = () => {
-      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
+      const cursorBaseX = (scrollX.value + cursorX) / zoomX.value;
       const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
       const draggingNote = copiedNotesForPreview.get(draggingNoteId);
       if (!draggingNote) {
@@ -359,11 +371,14 @@ export default defineComponent({
           return editedNotes.get(value.id) ?? value;
         });
       }
+
+      const guideLineBaseX = tickToBaseX(newNoteEndPos, tpqn.value);
+      guideLineX.value = guideLineBaseX * zoomX.value;
     };
 
     const previewMove = () => {
-      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
-      const cursorBaseY = (scrollY.value + currentCursorY) / zoomY.value;
+      const cursorBaseX = (scrollX.value + cursorX) / zoomX.value;
+      const cursorBaseY = (scrollY.value + cursorY) / zoomY.value;
       const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
       const cursorNoteNumber = baseYToNoteNumber(cursorBaseY);
       const draggingNote = copiedNotesForPreview.get(draggingNoteId);
@@ -401,10 +416,16 @@ export default defineComponent({
         });
         edited = true;
       }
+
+      const guidelineTicks =
+        Math.round(dragStartTicks / snapTicks.value) * snapTicks.value +
+        movingTicks;
+      const guideLineBaseX = tickToBaseX(guidelineTicks, tpqn.value);
+      guideLineX.value = guideLineBaseX * zoomX.value;
     };
 
     const previewResizeRight = () => {
-      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
+      const cursorBaseX = (scrollX.value + cursorX) / zoomX.value;
       const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
       const draggingNote = copiedNotesForPreview.get(draggingNoteId);
       if (!draggingNote) {
@@ -439,10 +460,13 @@ export default defineComponent({
         });
         edited = true;
       }
+
+      const guideLineBaseX = tickToBaseX(newNoteEndPos, tpqn.value);
+      guideLineX.value = guideLineBaseX * zoomX.value;
     };
 
     const previewResizeLeft = () => {
-      const cursorBaseX = (scrollX.value + currentCursorX) / zoomX.value;
+      const cursorBaseX = (scrollX.value + cursorX) / zoomX.value;
       const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
       const draggingNote = copiedNotesForPreview.get(draggingNoteId);
       if (!draggingNote) {
@@ -483,6 +507,9 @@ export default defineComponent({
         });
         edited = true;
       }
+
+      const guideLineBaseX = tickToBaseX(newNotePos, tpqn.value);
+      guideLineX.value = guideLineBaseX * zoomX.value;
     };
 
     const preview = () => {
@@ -523,8 +550,8 @@ export default defineComponent({
       if (!sequencerBodyElement) {
         throw new Error("sequencerBodyElement is null.");
       }
-      const cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
-      const cursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
+      cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
+      cursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
       if (cursorX >= sequencerBodyElement.clientWidth) {
         return;
       }
@@ -542,7 +569,8 @@ export default defineComponent({
         }
         note = {
           id: uuidv4(),
-          position: Math.round(cursorTicks / snapTicks.value) * snapTicks.value,
+          position:
+            Math.round(cursorTicks / snapTicks.value - 0.25) * snapTicks.value,
           duration: snapTicks.value,
           noteNumber: cursorNoteNumber,
           lyric: getDoremiFromNoteNumber(cursorNoteNumber),
@@ -586,8 +614,6 @@ export default defineComponent({
         }
       }
       previewMode = mode;
-      currentCursorX = cursorX;
-      currentCursorY = cursorY;
       dragStartTicks = cursorTicks;
       dragStartNoteNumber = cursorNoteNumber;
       draggingNoteId = note.id;
@@ -634,15 +660,22 @@ export default defineComponent({
     };
 
     const onMouseMove = (event: MouseEvent) => {
-      if (!nowPreviewing.value) {
-        return;
-      }
       const sequencerBodyElement = sequencerBody.value;
       if (!sequencerBodyElement) {
         throw new Error("sequencerBodyElement is null.");
       }
-      currentCursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
-      currentCursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
+      cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
+      cursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
+
+      if (!nowPreviewing.value) {
+        const scrollLeft = sequencerBodyElement.scrollLeft;
+        const cursorBaseX = (scrollLeft + cursorX) / zoomX.value;
+        const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
+        const guideLineTicks =
+          Math.round(cursorTicks / snapTicks.value - 0.25) * snapTicks.value;
+        const guideLineBaseX = tickToBaseX(guideLineTicks, tpqn.value);
+        guideLineX.value = guideLineBaseX * zoomX.value;
+      }
     };
 
     const onMouseUp = (event: MouseEvent) => {
@@ -667,6 +700,7 @@ export default defineComponent({
           });
         } else {
           store.dispatch("UPDATE_NOTES", { notes: previewNotes.value });
+          store.dispatch("DESELECT_ALL_NOTES");
         }
         if (previewNotes.value.length === 1) {
           store.dispatch("PLAY_PREVIEW_SOUND", {
@@ -693,6 +727,14 @@ export default defineComponent({
       }
     };
 
+    const onMouseEnter = () => {
+      showGuideLine.value = true;
+    };
+
+    const onMouseLeave = () => {
+      showGuideLine.value = false;
+    };
+
     // キーボードイベント
     const handleNotesArrowUp = () => {
       const editedNotes: Note[] = [];
@@ -847,8 +889,8 @@ export default defineComponent({
         throw new Error("sequencerBodyElement is null.");
       }
       if (event.ctrlKey) {
+        cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
         // マウスカーソル位置を基準に水平方向のズームを行う
-        const cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
         const oldZoomX = zoomX.value;
         let newZoomX = zoomX.value;
         newZoomX -= event.deltaY * (ZOOM_X_STEP * 0.01);
@@ -956,6 +998,8 @@ export default defineComponent({
       previewNotes,
       selectedNotes,
       unselectedNotes,
+      showGuideLine,
+      guideLineX,
       setZoomX,
       setZoomY,
       onNoteBodyMouseDown,
@@ -966,6 +1010,8 @@ export default defineComponent({
       onMouseMove,
       onMouseUp,
       onDoubleClick,
+      onMouseEnter,
+      onMouseLeave,
       onWheel,
       onScroll,
     };
@@ -1010,6 +1056,15 @@ export default defineComponent({
   position: relative;
 }
 
+.sequencer-guideline {
+  position: absolute;
+  top: 0;
+  left: -1px;
+  width: 2px;
+  background: hsl(130, 35%, 82%);
+  pointer-events: none;
+}
+
 .sequencer-overlay {
   grid-row: 2;
   grid-column: 2;
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 4467daed94..bfd3a22a09 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -208,7 +208,7 @@ export default defineComponent({
   padding: 0 1px 2px;
   background: white;
   color: colors.$display;
-  border: 1px solid hsl(130, 0%, 90%);
+  border: 1px solid hsl(130, 0%, 91%);
   border-radius: 3px;
   font-size: 12px;
   font-weight: bold;
@@ -230,8 +230,8 @@ export default defineComponent({
 .note-left-edge {
   position: absolute;
   top: 0;
-  left: -2px;
-  width: 6px;
+  left: 0px;
+  width: 4px;
   height: 100%;
   cursor: ew-resize;
 }
@@ -239,8 +239,8 @@ export default defineComponent({
 .note-right-edge {
   position: absolute;
   top: 0;
-  right: -2px;
-  width: 6px;
+  right: 0px;
+  width: 4px;
   height: 100%;
   cursor: ew-resize;
 }
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index a3ee4f97bc..b69f3e786c 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -332,7 +332,7 @@ export default defineComponent({
 }
 
 .singer-panel-toggler {
-  border: 2px solid #aaa;
+  border: 2px solid #bbb;
   border-radius: 50%;
   display: block;
   height: 48px;

From ebaa6bfa3bbeb3aa58182bdc4500fa4b68a462c5 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 15 Jan 2024 00:20:01 +0900
Subject: [PATCH 46/59] =?UTF-8?q?[project-s]=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E5=8F=B3=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=81=A7?=
 =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=83=A1?=
 =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=20(#1710)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ノートを右クリックでコンテキストメニューが表示されるように

* 修正

* ノートの端の判定を修正

* isSelfEventTarget関数へ

* // 当たり判定を0.25だけずらす

---------

Co-authored-by: Hiroshiba Kazuyuki <kazuyuki_hiroshiba@dwango.co.jp>
---
 src/components/Sing/ScoreSequencer.vue | 100 ++++++++++++++++++-------
 src/components/Sing/SequencerNote.vue  |  46 ++++++++----
 2 files changed, 104 insertions(+), 42 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 0d8069fdfa..3d49e959f5 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -105,20 +105,20 @@
         v-for="note in unselectedNotes"
         :key="note.id"
         :note="note"
-        @body-mousedown="onNoteBodyMouseDown($event, note)"
+        @bar-mousedown="onNoteBarMouseDown($event, note)"
         @left-edge-mousedown="onNoteLeftEdgeMouseDown($event, note)"
         @right-edge-mousedown="onNoteRightEdgeMouseDown($event, note)"
-        @lyric-mouse-down="onNoteLyricMouseDown(note)"
+        @lyric-mouse-down="onNoteLyricMouseDown($event, note)"
       />
       <sequencer-note
         v-for="note in nowPreviewing ? previewNotes : selectedNotes"
         :key="note.id"
         :note="note"
         is-selected
-        @body-mousedown="onNoteBodyMouseDown($event, note)"
+        @bar-mousedown="onNoteBarMouseDown($event, note)"
         @left-edge-mousedown="onNoteLeftEdgeMouseDown($event, note)"
         @right-edge-mousedown="onNoteRightEdgeMouseDown($event, note)"
-        @lyric-mouse-down="onNoteLyricMouseDown(note)"
+        @lyric-mouse-down="onNoteLyricMouseDown($event, note)"
       />
     </div>
     <div
@@ -212,6 +212,11 @@ import SequencerPhraseIndicator from "@/components/Sing/SequencerPhraseIndicator
 
 type PreviewMode = "ADD" | "MOVE" | "RESIZE_RIGHT" | "RESIZE_LEFT";
 
+// 直接イベントが来ているかどうか
+const isSelfEventTarget = (event: UIEvent) => {
+  return event.target === event.currentTarget;
+};
+
 export default defineComponent({
   name: "SingScoreSequencer",
   components: {
@@ -417,8 +422,9 @@ export default defineComponent({
         edited = true;
       }
 
+      // 当たり判定を0.25だけずらす
       const guidelineTicks =
-        Math.round(dragStartTicks / snapTicks.value) * snapTicks.value +
+        Math.round(dragStartTicks / snapTicks.value - 0.25) * snapTicks.value +
         movingTicks;
       const guideLineBaseX = tickToBaseX(guidelineTicks, tpqn.value);
       guideLineX.value = guideLineBaseX * zoomX.value;
@@ -536,6 +542,15 @@ export default defineComponent({
       return clientY - element.getBoundingClientRect().top;
     };
 
+    const selectOnlyThis = (note: Note) => {
+      store.dispatch("DESELECT_ALL_NOTES");
+      store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
+      store.dispatch("PLAY_PREVIEW_SOUND", {
+        noteNumber: note.noteNumber,
+        duration: PREVIEW_SOUND_DURATION,
+      });
+    };
+
     const startPreview = (
       event: MouseEvent,
       mode: PreviewMode,
@@ -602,12 +617,7 @@ export default defineComponent({
         } else if (event.ctrlKey) {
           store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
         } else if (!state.selectedNoteIds.has(note.id)) {
-          store.dispatch("DESELECT_ALL_NOTES");
-          store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
-          store.dispatch("PLAY_PREVIEW_SOUND", {
-            noteNumber: note.noteNumber,
-            duration: PREVIEW_SOUND_DURATION,
-          });
+          selectOnlyThis(note);
         }
         for (const note of selectedNotes.value) {
           copiedNotes.push({ ...note });
@@ -627,36 +637,64 @@ export default defineComponent({
       previewRequestId = requestAnimationFrame(preview);
     };
 
-    const onNoteBodyMouseDown = (event: MouseEvent, note: Note) => {
-      startPreview(event, "MOVE", note);
-      mouseDownNoteId = note.id;
+    const onNoteBarMouseDown = (event: MouseEvent, note: Note) => {
+      if (!isSelfEventTarget) {
+        return;
+      }
+      if (event.button === 0) {
+        startPreview(event, "MOVE", note);
+        mouseDownNoteId = note.id;
+      } else if (!state.selectedNoteIds.has(note.id)) {
+        selectOnlyThis(note);
+      }
     };
 
     const onNoteLeftEdgeMouseDown = (event: MouseEvent, note: Note) => {
-      startPreview(event, "RESIZE_LEFT", note);
-      mouseDownNoteId = note.id;
+      if (!isSelfEventTarget) {
+        return;
+      }
+      if (event.button === 0) {
+        startPreview(event, "RESIZE_LEFT", note);
+        mouseDownNoteId = note.id;
+      } else if (!state.selectedNoteIds.has(note.id)) {
+        selectOnlyThis(note);
+      }
     };
 
     const onNoteRightEdgeMouseDown = (event: MouseEvent, note: Note) => {
-      startPreview(event, "RESIZE_RIGHT", note);
-      mouseDownNoteId = note.id;
+      if (!isSelfEventTarget) {
+        return;
+      }
+      if (event.button === 0) {
+        startPreview(event, "RESIZE_RIGHT", note);
+        mouseDownNoteId = note.id;
+      } else if (!state.selectedNoteIds.has(note.id)) {
+        selectOnlyThis(note);
+      }
     };
 
-    const onNoteLyricMouseDown = (note: Note) => {
+    const onNoteLyricMouseDown = (event: MouseEvent, note: Note) => {
+      if (!isSelfEventTarget) {
+        return;
+      }
       if (!state.selectedNoteIds.has(note.id)) {
-        store.dispatch("DESELECT_ALL_NOTES");
-        store.dispatch("SELECT_NOTES", { noteIds: [note.id] });
-        store.dispatch("PLAY_PREVIEW_SOUND", {
-          noteNumber: note.noteNumber,
-          duration: PREVIEW_SOUND_DURATION,
-        });
+        selectOnlyThis(note);
+      }
+      if (event.button === 0) {
+        mouseDownNoteId = note.id;
       }
-      mouseDownNoteId = note.id;
     };
 
     const onMouseDown = (event: MouseEvent) => {
-      startPreview(event, "ADD");
-      mouseDownNoteId = undefined;
+      if (!isSelfEventTarget) {
+        return;
+      }
+      if (event.button === 0) {
+        startPreview(event, "ADD");
+        mouseDownNoteId = undefined;
+      } else {
+        store.dispatch("DESELECT_ALL_NOTES");
+      }
     };
 
     const onMouseMove = (event: MouseEvent) => {
@@ -679,6 +717,9 @@ export default defineComponent({
     };
 
     const onMouseUp = (event: MouseEvent) => {
+      if (event.button !== 0) {
+        return;
+      }
       clickedNoteIds[0] = clickedNoteIds[1];
       clickedNoteIds[1] = mouseDownNoteId;
       if (event.detail === 1) {
@@ -1002,7 +1043,7 @@ export default defineComponent({
       guideLineX,
       setZoomX,
       setZoomY,
-      onNoteBodyMouseDown,
+      onNoteBarMouseDown,
       onNoteLeftEdgeMouseDown,
       onNoteRightEdgeMouseDown,
       onNoteLyricMouseDown,
@@ -1094,6 +1135,7 @@ export default defineComponent({
 
 .sequencer-grid {
   display: block;
+  pointer-events: none;
 }
 
 .sequencer-grid-cell {
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index bfd3a22a09..e949f875ce 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -11,12 +11,13 @@
       transform: `translate3d(${positionX}px,${positionY}px,0)`,
     }"
   >
-    <div class="note-lyric" @mousedown.stop="onLyricMouseDown">
+    <div class="note-lyric" @mousedown="onLyricMouseDown">
       {{ lyric }}
     </div>
-    <div class="note-bar" @mousedown.stop="onBodyMouseDown">
-      <div class="note-left-edge" @mousedown.stop="onLeftEdgeMouseDown"></div>
-      <div class="note-right-edge" @mousedown.stop="onRightEdgeMouseDown"></div>
+    <div class="note-bar" @mousedown="onBarMouseDown">
+      <div class="note-left-edge" @mousedown="onLeftEdgeMouseDown"></div>
+      <div class="note-right-edge" @mousedown="onRightEdgeMouseDown"></div>
+      <context-menu ref="contextMenu" :menudata="contextMenuData" />
     </div>
     <input
       v-if="showLyricInput"
@@ -32,7 +33,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, PropType } from "vue";
+import { defineComponent, computed, PropType, ref } from "vue";
 import { useStore } from "@/store";
 import { Note } from "@/store/type";
 import {
@@ -40,11 +41,16 @@ import {
   tickToBaseX,
   noteNumberToBaseY,
 } from "@/sing/viewHelper";
+import ContextMenu from "@/components/ContextMenu.vue";
+import { MenuItemButton } from "@/components/MenuBar.vue";
 
 type NoteState = "NORMAL" | "SELECTED" | "OVERLAPPING";
 
 export default defineComponent({
   name: "SingSequencerNote",
+  components: {
+    ContextMenu,
+  },
   directives: {
     focus: { mounted: (el: HTMLElement) => el.focus() },
   },
@@ -53,7 +59,7 @@ export default defineComponent({
     isSelected: { type: Boolean },
   },
   emits: [
-    "bodyMousedown",
+    "barMousedown",
     "rightEdgeMousedown",
     "leftEdgeMousedown",
     "lyricMouseDown",
@@ -104,9 +110,21 @@ export default defineComponent({
     const showLyricInput = computed(() => {
       return state.editingLyricNoteId === props.note.id;
     });
+    const contextMenu = ref<InstanceType<typeof ContextMenu>>();
+    const contextMenuData = ref<[MenuItemButton]>([
+      {
+        type: "button",
+        label: "削除",
+        onClick: async () => {
+          contextMenu.value?.hide();
+          store.dispatch("REMOVE_SELECTED_NOTES");
+        },
+        disableWhenUiLocked: true,
+      },
+    ]);
 
-    const onBodyMouseDown = (event: MouseEvent) => {
-      emit("bodyMousedown", event);
+    const onBarMouseDown = (event: MouseEvent) => {
+      emit("barMousedown", event);
     };
 
     const onRightEdgeMouseDown = (event: MouseEvent) => {
@@ -160,7 +178,9 @@ export default defineComponent({
       noteState,
       lyric,
       showLyricInput,
-      onBodyMouseDown,
+      contextMenu,
+      contextMenuData,
+      onBarMouseDown,
       onRightEdgeMouseDown,
       onLeftEdgeMouseDown,
       onLyricMouseDown,
@@ -230,8 +250,8 @@ export default defineComponent({
 .note-left-edge {
   position: absolute;
   top: 0;
-  left: 0px;
-  width: 4px;
+  left: -1px;
+  width: 5px;
   height: 100%;
   cursor: ew-resize;
 }
@@ -239,8 +259,8 @@ export default defineComponent({
 .note-right-edge {
   position: absolute;
   top: 0;
-  right: 0px;
-  width: 4px;
+  right: -1px;
+  width: 5px;
   height: 100%;
   cursor: ew-resize;
 }

From 5616743857912d11269fab96098ed3352ba3ec94 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Thu, 18 Jan 2024 08:35:13 +0900
Subject: [PATCH 47/59] =?UTF-8?q?[project-s]=20project-s=E7=94=A8=E3=81=AE?=
 =?UTF-8?q?opanpi=E3=81=AB=E6=9B=B4=E6=96=B0=20(#1722)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

project-s用のopanpiに更新
---
 openapi.json                                  |   2 +-
 src/openapi/.openapi-generator/FILES          |   5 +-
 src/openapi/apis/DefaultApi.ts                | 222 ++++++++++++------
 src/openapi/models/AccentPhrase.ts            |   2 +-
 src/openapi/models/AudioQuery.ts              |  16 +-
 src/openapi/models/EngineManifest.ts          |  11 +-
 src/openapi/models/FrameAudioQuery.ts         | 118 ++++++++++
 src/openapi/models/FramePhoneme.ts            |  75 ++++++
 src/openapi/models/HTTPValidationError.ts     |   2 +-
 src/openapi/models/LibrarySpeaker.ts          |   2 +-
 src/openapi/models/LicenseInfo.ts             |   2 +-
 src/openapi/models/Mora.ts                    |   2 +-
 src/openapi/models/MorphableTargetInfo.ts     |   2 +-
 src/openapi/models/Note.ts                    |  83 +++++++
 src/openapi/models/ParseKanaBadRequest.ts     |  18 +-
 src/openapi/models/Preset.ts                  |   2 +-
 src/openapi/models/Score.ts                   |  73 ++++++
 src/openapi/models/Speaker.ts                 |   2 +-
 src/openapi/models/SpeakerInfo.ts             |   2 +-
 src/openapi/models/SpeakerStyle.ts            |  22 +-
 ...peakerSupportPermittedSynthesisMorphing.ts |   2 +-
 .../models/SpeakerSupportedFeatures.ts        |   2 +-
 src/openapi/models/StyleInfo.ts               |   2 +-
 src/openapi/models/SupportedDevicesInfo.ts    |   2 +-
 src/openapi/models/SupportedFeatures.ts       |   2 +-
 src/openapi/models/UpdateInfo.ts              |   2 +-
 src/openapi/models/UserDictWord.ts            |   2 +-
 src/openapi/models/ValidationError.ts         |   2 +-
 src/openapi/models/VvlibManifest.ts           |   2 +-
 src/openapi/models/WordTypes.ts               |  28 +--
 src/openapi/models/index.ts                   |   5 +-
 src/openapi/runtime.ts                        |   2 +-
 32 files changed, 585 insertions(+), 131 deletions(-)
 create mode 100644 src/openapi/models/FrameAudioQuery.ts
 create mode 100644 src/openapi/models/FramePhoneme.ts
 create mode 100644 src/openapi/models/Note.ts
 create mode 100644 src/openapi/models/Score.ts

diff --git a/openapi.json b/openapi.json
index 996384f7e1..fae0f96234 100644
--- a/openapi.json
+++ b/openapi.json
@@ -1 +1 @@
-{"openapi":"3.1.0","info":{"title":"VOICEVOX Engine","description":"VOICEVOXの音声合成エンジンです。","version":"latest"},"paths":{"/audio_query":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリを作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_audio_query_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/audio_query_from_preset":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリをプリセットを用いて作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_from_preset_audio_query_from_preset_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":true,"schema":{"type":"integer","title":"Preset Id"},"name":"preset_id","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/accent_phrases":{"post":{"tags":["クエリ編集"],"summary":"テキストからアクセント句を得る","description":"テキストからアクセント句を得ます。\nis_kanaが`true`のとき、テキストは次のAquesTalk 風記法で解釈されます。デフォルトは`false`です。\n* 全てのカナはカタカナで記述される\n* アクセント句は`/`または`、`で区切る。`、`で区切った場合に限り無音区間が挿入される。\n* カナの手前に`_`を入れるとそのカナは無声化される\n* アクセント位置を`'`で指定する。全てのアクセント句にはアクセント位置を1つ指定する必要がある。\n* アクセント句末に`？`(全角)を入れることにより疑問文の発音ができる。","operationId":"accent_phrases_accent_phrases_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"boolean","title":"Is Kana","default":false},"name":"is_kana","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Accent Phrases Accent Phrases Post"}}}},"400":{"description":"読み仮名のパースに失敗","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_data":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高・音素長を得る","operationId":"mora_data_mora_data_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Data Mora Data Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_length":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音素長を得る","operationId":"mora_length_mora_length_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Length Mora Length Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_pitch":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高を得る","operationId":"mora_pitch_mora_pitch_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Pitch Mora Pitch Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する","operationId":"synthesis_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"疑問系のテキストが与えられたら語尾を自動調整する","required":false,"schema":{"type":"boolean","title":"Enable Interrogative Upspeak","description":"疑問系のテキストが与えられたら語尾を自動調整する","default":true},"name":"enable_interrogative_upspeak","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/cancellable_synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する（キャンセル可能）","operationId":"cancellable_synthesis_cancellable_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/multi_synthesis":{"post":{"tags":["音声合成"],"summary":"複数まとめて音声合成する","operationId":"multi_synthesis_multi_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AudioQuery"},"type":"array","title":"Queries"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/zip":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/morphable_targets":{"post":{"tags":["音声合成"],"summary":"指定したスタイルに対してエンジン内の話者がモーフィングが可能か判定する","description":"指定されたベーススタイルに対してエンジン内の各話者がモーフィング機能を利用可能か返します。\nモーフィングの許可/禁止は`/speakers`の`speaker.supported_features.synthesis_morphing`に記載されています。\nプロパティが存在しない場合は、モーフィングが許可されているとみなします。\n返り値の話者はstring型なので注意。","operationId":"morphable_targets_morphable_targets_post","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"type":"integer"},"type":"array","title":"Base Style Ids"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"additionalProperties":{"$ref":"#/components/schemas/MorphableTargetInfo"},"type":"object"},"type":"array","title":"Response Morphable Targets Morphable Targets Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis_morphing":{"post":{"tags":["音声合成"],"summary":"2種類のスタイルでモーフィングした音声を合成する","description":"指定された2種類のスタイルで音声を合成、指定した割合でモーフィングした音声を得ます。\nモーフィングの割合は`morph_rate`で指定でき、0.0でベースのスタイル、1.0でターゲットのスタイルに近づきます。","operationId":"_synthesis_morphing_synthesis_morphing_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Base Style Id"},"name":"base_style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Base Speaker"},"name":"base_speaker","in":"query"},{"required":false,"schema":{"type":"integer","title":"Target Style Id"},"name":"target_style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Target Speaker"},"name":"target_speaker","in":"query"},{"required":true,"schema":{"type":"number","maximum":1.0,"minimum":0.0,"title":"Morph Rate"},"name":"morph_rate","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/connect_waves":{"post":{"tags":["その他"],"summary":"base64エンコードされた複数のwavデータを一つに結合する","description":"base64エンコードされたwavデータを一纏めにし、wavファイルで返します。","operationId":"connect_waves_connect_waves_post","requestBody":{"content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Waves"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/presets":{"get":{"tags":["その他"],"summary":"Get Presets","description":"エンジンが保持しているプリセットの設定を返します\n\nReturns\n-------\npresets: list[Preset]\n    プリセットのリスト","operationId":"get_presets_presets_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Preset"},"type":"array","title":"Response Get Presets Presets Get"}}}}}}},"/add_preset":{"post":{"tags":["その他"],"summary":"Add Preset","description":"新しいプリセットを追加します\n\nParameters\n-------\npreset: Preset\n    新しいプリセット。\n    プリセットIDが既存のものと重複している場合は、新規のプリセットIDが採番されます。\n\nReturns\n-------\nid: int\n    追加したプリセットのプリセットID","operationId":"add_preset_add_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Add Preset Add Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/update_preset":{"post":{"tags":["その他"],"summary":"Update Preset","description":"既存のプリセットを更新します\n\nParameters\n-------\npreset: Preset\n    更新するプリセット。\n    プリセットIDが更新対象と一致している必要があります。\n\nReturns\n-------\nid: int\n    更新したプリセットのプリセットID","operationId":"update_preset_update_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Update Preset Update Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/delete_preset":{"post":{"tags":["その他"],"summary":"Delete Preset","description":"既存のプリセットを削除します\n\nParameters\n-------\nid: int\n    削除するプリセットのプリセットID","operationId":"delete_preset_delete_preset_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Id"},"name":"id","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/version":{"get":{"tags":["その他"],"summary":"Version","operationId":"version_version_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Version Version Get"}}}}}}},"/core_versions":{"get":{"tags":["その他"],"summary":"Core Versions","operationId":"core_versions_core_versions_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Response Core Versions Core Versions Get"}}}}}}},"/speakers":{"get":{"tags":["その他"],"summary":"Speakers","operationId":"speakers_speakers_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Speaker"},"type":"array","title":"Response Speakers Speakers Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/speaker_info":{"get":{"tags":["その他"],"summary":"Speaker Info","description":"指定されたspeaker_uuidに関する情報をjson形式で返します。\n画像や音声はbase64エンコードされたものが返されます。\n\nReturns\n-------\nret_data: SpeakerInfo","operationId":"speaker_info_speaker_info_get","parameters":[{"required":true,"schema":{"type":"string","title":"Speaker Uuid"},"name":"speaker_uuid","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SpeakerInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/downloadable_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Downloadable Libraries","description":"ダウンロード可能な音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: list[DownloadableLibrary]","operationId":"downloadable_libraries_downloadable_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/DownloadableLibraryInfo"},"type":"array","title":"Response Downloadable Libraries Downloadable Libraries Get"}}}}}}},"/installed_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Installed Libraries","description":"インストールした音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: dict[str, InstalledLibrary]","operationId":"installed_libraries_installed_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/InstalledLibraryInfo"},"type":"object","title":"Response Installed Libraries Installed Libraries Get"}}}}}}},"/install_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Install Library","description":"音声ライブラリをインストールします。\n音声ライブラリのZIPファイルをリクエストボディとして送信してください。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"install_library_install_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/uninstall_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Uninstall Library","description":"音声ライブラリをアンインストールします。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"uninstall_library_uninstall_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_style_id":{"post":{"tags":["その他"],"summary":"Initialize Style Id","description":"指定されたstyle_idのスタイルを初期化します。\n実行しなくても他のAPIは使用できますが、初回実行時に時間がかかることがあります。","operationId":"initialize_style_id_initialize_style_id_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","required":false,"schema":{"type":"boolean","title":"Skip Reinit","description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/is_initialized_style_id":{"get":{"tags":["その他"],"summary":"Is Initialized Style Id","description":"指定されたstyle_idのスタイルが初期化されているかどうかを返します。","operationId":"is_initialized_style_id_is_initialized_style_id_get","parameters":[{"required":true,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Is Initialized Style Id Is Initialized Style Id Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_speaker":{"post":{"tags":["その他"],"summary":"Initialize Speaker","description":"こちらのAPIは非推奨です。`initialize_style_id`を利用してください。","operationId":"initialize_speaker_initialize_speaker_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"既に初期化済みの話者の再初期化をスキップするかどうか","required":false,"schema":{"type":"boolean","title":"Skip Reinit","description":"既に初期化済みの話者の再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}},"deprecated":true}},"/is_initialized_speaker":{"get":{"tags":["その他"],"summary":"Is Initialized Speaker","description":"こちらのAPIは非推奨です。`is_initialize_style_id`を利用してください。","operationId":"is_initialized_speaker_is_initialized_speaker_get","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Is Initialized Speaker Is Initialized Speaker Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}},"deprecated":true}},"/user_dict":{"get":{"tags":["ユーザー辞書"],"summary":"Get User Dict Words","description":"ユーザー辞書に登録されている単語の一覧を返します。\n単語の表層形(surface)は正規化済みの物を返します。\n\nReturns\n-------\ndict[str, UserDictWord]\n    単語のUUIDとその詳細","operationId":"get_user_dict_words_user_dict_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Response Get User Dict Words User Dict Get"}}}}}}},"/user_dict_word":{"post":{"tags":["ユーザー辞書"],"summary":"Add User Dict Word","description":"ユーザー辞書に言葉を追加します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"add_user_dict_word_user_dict_word_post","parameters":[{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Add User Dict Word User Dict Word Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict_word/{word_uuid}":{"put":{"tags":["ユーザー辞書"],"summary":"Rewrite User Dict Word","description":"ユーザー辞書に登録されている言葉を更新します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_uuid: str\n    更新する言葉のUUID\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"rewrite_user_dict_word_user_dict_word__word_uuid__put","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"},{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}},"delete":{"tags":["ユーザー辞書"],"summary":"Delete User Dict Word","description":"ユーザー辞書に登録されている言葉を削除します。\n\nParameters\n----------\nword_uuid: str\n    削除する言葉のUUID","operationId":"delete_user_dict_word_user_dict_word__word_uuid__delete","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/import_user_dict":{"post":{"tags":["ユーザー辞書"],"summary":"Import User Dict Words","description":"他のユーザー辞書をインポートします。\n\nParameters\n----------\nimport_dict_data: dict[str, UserDictWord]\n    インポートするユーザー辞書のデータ\noverride: bool\n    重複したエントリがあった場合、上書きするかどうか","operationId":"import_user_dict_words_import_user_dict_post","parameters":[{"required":true,"schema":{"type":"boolean","title":"Override"},"name":"override","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Import Dict Data"}}},"required":true},"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/supported_devices":{"get":{"tags":["その他"],"summary":"Supported Devices","operationId":"supported_devices_supported_devices_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SupportedDevicesInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/engine_manifest":{"get":{"tags":["その他"],"summary":"Engine Manifest","operationId":"engine_manifest_engine_manifest_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/EngineManifest"}}}}}}},"/validate_kana":{"post":{"tags":["その他"],"summary":"テキストがAquesTalk 風記法に従っているか判定する","description":"テキストがAquesTalk 風記法に従っているかどうかを判定します。\n従っていない場合はエラーが返ります。\n\nParameters\n----------\ntext: str\n    判定する対象の文字列","operationId":"validate_kana_validate_kana_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Validate Kana Validate Kana Post"}}}},"400":{"description":"テキストが不正です","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/setting":{"get":{"tags":["設定"],"summary":"Setting Get","description":"設定ページを返します。","operationId":"setting_get_setting_get","responses":{"200":{"description":"Successful Response"}}},"post":{"tags":["設定"],"summary":"Setting Post","description":"設定を更新します。","operationId":"setting_post_setting_post","requestBody":{"content":{"application/x-www-form-urlencoded":{"schema":{"$ref":"#/components/schemas/Body_setting_post_setting_post"}}},"required":true},"responses":{"200":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}}},"components":{"schemas":{"AccentPhrase":{"properties":{"moras":{"items":{"$ref":"#/components/schemas/Mora"},"type":"array","title":"モーラのリスト"},"accent":{"type":"integer","title":"アクセント箇所"},"pause_mora":{"allOf":[{"$ref":"#/components/schemas/Mora"}],"title":"後ろに無音を付けるかどうか"},"is_interrogative":{"type":"boolean","title":"疑問系かどうか","default":false}},"type":"object","required":["moras","accent"],"title":"AccentPhrase","description":"アクセント句ごとの情報"},"AudioQuery":{"properties":{"accent_phrases":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"アクセント句のリスト"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"},"outputSamplingRate":{"type":"integer","title":"音声データの出力サンプリングレート"},"outputStereo":{"type":"boolean","title":"音声データをステレオ出力するか否か"},"kana":{"type":"string","title":"[読み取り専用]AquesTalk 風記法によるテキスト。音声合成用のクエリとしては無視される"}},"type":"object","required":["accent_phrases","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength","outputSamplingRate","outputStereo"],"title":"AudioQuery","description":"音声合成用のクエリ"},"Body_setting_post_setting_post":{"properties":{"cors_policy_mode":{"$ref":"#/components/schemas/CorsPolicyMode"},"allow_origin":{"type":"string","title":"Allow Origin"}},"type":"object","required":["cors_policy_mode"],"title":"Body_setting_post_setting_post"},"CorsPolicyMode":{"type":"string","enum":["all","localapps"],"title":"CorsPolicyMode","description":"CORSの許可モード"},"DownloadableLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers"],"title":"DownloadableLibraryInfo","description":"ダウンロード可能な音声ライブラリの情報"},"EngineManifest":{"properties":{"manifest_version":{"type":"string","title":"マニフェストのバージョン"},"name":{"type":"string","title":"エンジン名"},"brand_name":{"type":"string","title":"ブランド名"},"uuid":{"type":"string","title":"エンジンのUUID"},"url":{"type":"string","title":"エンジンのURL"},"icon":{"type":"string","title":"エンジンのアイコンをBASE64エンコードしたもの"},"default_sampling_rate":{"type":"integer","title":"デフォルトのサンプリング周波数"},"terms_of_service":{"type":"string","title":"エンジンの利用規約"},"update_infos":{"items":{"$ref":"#/components/schemas/UpdateInfo"},"type":"array","title":"エンジンのアップデート情報"},"dependency_licenses":{"items":{"$ref":"#/components/schemas/LicenseInfo"},"type":"array","title":"依存関係のライセンス情報"},"supported_vvlib_manifest_version":{"type":"string","title":"エンジンが対応するvvlibのバージョン"},"supported_features":{"allOf":[{"$ref":"#/components/schemas/SupportedFeatures"}],"title":"エンジンが持つ機能"}},"type":"object","required":["manifest_version","name","brand_name","uuid","url","icon","default_sampling_rate","terms_of_service","update_infos","dependency_licenses","supported_features"],"title":"EngineManifest","description":"エンジン自体に関する情報"},"HTTPValidationError":{"properties":{"detail":{"items":{"$ref":"#/components/schemas/ValidationError"},"type":"array","title":"Detail"}},"type":"object","title":"HTTPValidationError"},"InstalledLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"},"uninstallable":{"type":"boolean","title":"アンインストール可能かどうか"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers","uninstallable"],"title":"InstalledLibraryInfo","description":"インストール済み音声ライブラリの情報"},"LibrarySpeaker":{"properties":{"speaker":{"allOf":[{"$ref":"#/components/schemas/Speaker"}],"title":"話者情報"},"speaker_info":{"allOf":[{"$ref":"#/components/schemas/SpeakerInfo"}],"title":"話者の追加情報"}},"type":"object","required":["speaker","speaker_info"],"title":"LibrarySpeaker","description":"音声ライブラリに含まれる話者の情報"},"LicenseInfo":{"properties":{"name":{"type":"string","title":"依存ライブラリ名"},"version":{"type":"string","title":"依存ライブラリのバージョン"},"license":{"type":"string","title":"依存ライブラリのライセンス名"},"text":{"type":"string","title":"依存ライブラリのライセンス本文"}},"type":"object","required":["name","text"],"title":"LicenseInfo","description":"依存ライブラリのライセンス情報"},"Mora":{"properties":{"text":{"type":"string","title":"文字"},"consonant":{"type":"string","title":"子音の音素"},"consonant_length":{"type":"number","title":"子音の音長"},"vowel":{"type":"string","title":"母音の音素"},"vowel_length":{"type":"number","title":"母音の音長"},"pitch":{"type":"number","title":"音高"}},"type":"object","required":["text","vowel","vowel_length","pitch"],"title":"Mora","description":"モーラ（子音＋母音）ごとの情報"},"MorphableTargetInfo":{"properties":{"is_morphable":{"type":"boolean","title":"指定した話者に対してモーフィングの可否"}},"type":"object","required":["is_morphable"],"title":"MorphableTargetInfo"},"ParseKanaBadRequest":{"properties":{"text":{"type":"string","title":"エラーメッセージ"},"error_name":{"type":"string","title":"エラー名","description":"|name|description|\n|---|---|\n| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |\n| ACCENT_TOP | 句頭にアクセントは置けません: {text} |\n| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |\n| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |\n| EMPTY_PHRASE | {position}番目のアクセント句が空白です |\n| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |\n| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |"},"error_args":{"additionalProperties":{"type":"string"},"type":"object","title":"エラーを起こした箇所"}},"type":"object","required":["text","error_name","error_args"],"title":"ParseKanaBadRequest"},"Preset":{"properties":{"id":{"type":"integer","title":"プリセットID"},"name":{"type":"string","title":"プリセット名"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"style_id":{"type":"integer","title":"スタイルID"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"}},"type":"object","required":["id","name","speaker_uuid","style_id","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength"],"title":"Preset","description":"プリセット情報"},"Speaker":{"properties":{"supported_features":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportedFeatures"}],"title":"話者の対応機能"},"name":{"type":"string","title":"名前"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"styles":{"items":{"$ref":"#/components/schemas/SpeakerStyle"},"type":"array","title":"スタイルの一覧"},"version":{"type":"string","title":"Version","default":"話者のバージョン"}},"type":"object","required":["name","speaker_uuid","styles"],"title":"Speaker","description":"話者情報"},"SpeakerInfo":{"properties":{"policy":{"type":"string","title":"policy.md"},"portrait":{"type":"string","title":"portrait.pngをbase64エンコードしたもの"},"style_infos":{"items":{"$ref":"#/components/schemas/StyleInfo"},"type":"array","title":"スタイルの追加情報"}},"type":"object","required":["policy","portrait","style_infos"],"title":"SpeakerInfo","description":"話者の追加情報"},"SpeakerStyle":{"properties":{"name":{"type":"string","title":"スタイル名"},"id":{"type":"integer","title":"スタイルID"}},"type":"object","required":["name","id"],"title":"SpeakerStyle","description":"話者のスタイル情報"},"SpeakerSupportPermittedSynthesisMorphing":{"type":"string","enum":["ALL","SELF_ONLY","NOTHING"],"title":"SpeakerSupportPermittedSynthesisMorphing","description":"An enumeration."},"SpeakerSupportedFeatures":{"properties":{"permitted_synthesis_morphing":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportPermittedSynthesisMorphing"}],"title":"モーフィング機能への対応","default":"ALL"}},"type":"object","title":"SpeakerSupportedFeatures","description":"話者の対応機能の情報"},"StyleInfo":{"properties":{"id":{"type":"integer","title":"スタイルID"},"icon":{"type":"string","title":"当該スタイルのアイコンをbase64エンコードしたもの"},"portrait":{"type":"string","title":"当該スタイルのportrait.pngをbase64エンコードしたもの"},"voice_samples":{"items":{"type":"string"},"type":"array","title":"voice_sampleのwavファイルをbase64エンコードしたもの"}},"type":"object","required":["id","icon","voice_samples"],"title":"StyleInfo","description":"スタイルの追加情報"},"SupportedDevicesInfo":{"properties":{"cpu":{"type":"boolean","title":"CPUに対応しているか"},"cuda":{"type":"boolean","title":"CUDA(Nvidia GPU)に対応しているか"},"dml":{"type":"boolean","title":"DirectML(Nvidia GPU/Radeon GPU等)に対応しているか"}},"type":"object","required":["cpu","cuda","dml"],"title":"SupportedDevicesInfo","description":"対応しているデバイスの情報"},"SupportedFeatures":{"properties":{"adjust_mora_pitch":{"type":"boolean","title":"モーラごとの音高の調整"},"adjust_phoneme_length":{"type":"boolean","title":"音素ごとの長さの調整"},"adjust_speed_scale":{"type":"boolean","title":"全体の話速の調整"},"adjust_pitch_scale":{"type":"boolean","title":"全体の音高の調整"},"adjust_intonation_scale":{"type":"boolean","title":"全体の抑揚の調整"},"adjust_volume_scale":{"type":"boolean","title":"全体の音量の調整"},"interrogative_upspeak":{"type":"boolean","title":"疑問文の自動調整"},"synthesis_morphing":{"type":"boolean","title":"2種類のスタイルでモーフィングした音声を合成"},"manage_library":{"type":"boolean","title":"音声ライブラリのインストール・アンインストール"}},"type":"object","required":["adjust_mora_pitch","adjust_phoneme_length","adjust_speed_scale","adjust_pitch_scale","adjust_intonation_scale","adjust_volume_scale","interrogative_upspeak","synthesis_morphing"],"title":"SupportedFeatures","description":"エンジンが持つ機能の一覧"},"UpdateInfo":{"properties":{"version":{"type":"string","title":"エンジンのバージョン名"},"descriptions":{"items":{"type":"string"},"type":"array","title":"アップデートの詳細についての説明"},"contributors":{"items":{"type":"string"},"type":"array","title":"貢献者名"}},"type":"object","required":["version","descriptions"],"title":"UpdateInfo","description":"エンジンのアップデート情報"},"UserDictWord":{"properties":{"surface":{"type":"string","title":"表層形"},"priority":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"優先度"},"context_id":{"type":"integer","title":"文脈ID","default":1348},"part_of_speech":{"type":"string","title":"品詞"},"part_of_speech_detail_1":{"type":"string","title":"品詞細分類1"},"part_of_speech_detail_2":{"type":"string","title":"品詞細分類2"},"part_of_speech_detail_3":{"type":"string","title":"品詞細分類3"},"inflectional_type":{"type":"string","title":"活用型"},"inflectional_form":{"type":"string","title":"活用形"},"stem":{"type":"string","title":"原形"},"yomi":{"type":"string","title":"読み"},"pronunciation":{"type":"string","title":"発音"},"accent_type":{"type":"integer","title":"アクセント型"},"mora_count":{"type":"integer","title":"モーラ数"},"accent_associative_rule":{"type":"string","title":"アクセント結合規則"}},"type":"object","required":["surface","priority","part_of_speech","part_of_speech_detail_1","part_of_speech_detail_2","part_of_speech_detail_3","inflectional_type","inflectional_form","stem","yomi","pronunciation","accent_type","accent_associative_rule"],"title":"UserDictWord","description":"辞書のコンパイルに使われる情報"},"ValidationError":{"properties":{"loc":{"items":{"anyOf":[{"type":"string"},{"type":"integer"}]},"type":"array","title":"Location"},"msg":{"type":"string","title":"Message"},"type":{"type":"string","title":"Error Type"}},"type":"object","required":["loc","msg","type"],"title":"ValidationError"},"WordTypes":{"type":"string","enum":["PROPER_NOUN","COMMON_NOUN","VERB","ADJECTIVE","SUFFIX"],"title":"WordTypes","description":"fastapiでword_type引数を検証する時に使用するクラス"},"VvlibManifest":{"title":"VvlibManifest","description":"vvlib(VOICEVOX Library)に関する情報","type":"object","properties":{"manifest_version":{"title":"マニフェストバージョン","type":"string"},"name":{"title":"音声ライブラリ名","type":"string"},"version":{"title":"音声ライブラリバージョン","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"brand_name":{"title":"エンジンのブランド名","type":"string"},"engine_name":{"title":"エンジン名","type":"string"},"engine_uuid":{"title":"エンジンのUUID","type":"string"}},"required":["manifest_version","name","version","uuid","brand_name","engine_name","engine_uuid"]},"BaseLibraryInfo":{"title":"BaseLibraryInfo","description":"音声ライブラリの情報","type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}}},"required":["name","uuid","version","download_url","bytes","speakers"]}}}}
+{"openapi":"3.1.0","info":{"title":"VOICEVOX Engine","description":"VOICEVOXの音声合成エンジンです。","version":"latest"},"paths":{"/audio_query":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリを作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_audio_query_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/audio_query_from_preset":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリをプリセットを用いて作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_from_preset_audio_query_from_preset_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":true,"schema":{"type":"integer","title":"Preset Id"},"name":"preset_id","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/accent_phrases":{"post":{"tags":["クエリ編集"],"summary":"テキストからアクセント句を得る","description":"テキストからアクセント句を得ます。\nis_kanaが`true`のとき、テキストは次のAquesTalk 風記法で解釈されます。デフォルトは`false`です。\n* 全てのカナはカタカナで記述される\n* アクセント句は`/`または`、`で区切る。`、`で区切った場合に限り無音区間が挿入される。\n* カナの手前に`_`を入れるとそのカナは無声化される\n* アクセント位置を`'`で指定する。全てのアクセント句にはアクセント位置を1つ指定する必要がある。\n* アクセント句末に`？`(全角)を入れることにより疑問文の発音ができる。","operationId":"accent_phrases_accent_phrases_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"boolean","title":"Is Kana","default":false},"name":"is_kana","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Accent Phrases Accent Phrases Post"}}}},"400":{"description":"読み仮名のパースに失敗","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_data":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高・音素長を得る","operationId":"mora_data_mora_data_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Data Mora Data Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_length":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音素長を得る","operationId":"mora_length_mora_length_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Length Mora Length Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_pitch":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高を得る","operationId":"mora_pitch_mora_pitch_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Pitch Mora Pitch Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する","operationId":"synthesis_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"疑問系のテキストが与えられたら語尾を自動調整する","required":false,"schema":{"type":"boolean","title":"Enable Interrogative Upspeak","description":"疑問系のテキストが与えられたら語尾を自動調整する","default":true},"name":"enable_interrogative_upspeak","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/cancellable_synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する（キャンセル可能）","operationId":"cancellable_synthesis_cancellable_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/multi_synthesis":{"post":{"tags":["音声合成"],"summary":"複数まとめて音声合成する","operationId":"multi_synthesis_multi_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AudioQuery"},"type":"array","title":"Queries"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/zip":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/morphable_targets":{"post":{"tags":["音声合成"],"summary":"指定したスタイルに対してエンジン内の話者がモーフィングが可能か判定する","description":"指定されたベーススタイルに対してエンジン内の各話者がモーフィング機能を利用可能か返します。\nモーフィングの許可/禁止は`/speakers`の`speaker.supported_features.synthesis_morphing`に記載されています。\nプロパティが存在しない場合は、モーフィングが許可されているとみなします。\n返り値の話者はstring型なので注意。","operationId":"morphable_targets_morphable_targets_post","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"type":"integer"},"type":"array","title":"Base Style Ids"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"additionalProperties":{"$ref":"#/components/schemas/MorphableTargetInfo"},"type":"object"},"type":"array","title":"Response Morphable Targets Morphable Targets Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis_morphing":{"post":{"tags":["音声合成"],"summary":"2種類のスタイルでモーフィングした音声を合成する","description":"指定された2種類のスタイルで音声を合成、指定した割合でモーフィングした音声を得ます。\nモーフィングの割合は`morph_rate`で指定でき、0.0でベースのスタイル、1.0でターゲットのスタイルに近づきます。","operationId":"_synthesis_morphing_synthesis_morphing_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Base Style Id"},"name":"base_style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Base Speaker"},"name":"base_speaker","in":"query"},{"required":false,"schema":{"type":"integer","title":"Target Style Id"},"name":"target_style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Target Speaker"},"name":"target_speaker","in":"query"},{"required":true,"schema":{"type":"number","maximum":1.0,"minimum":0.0,"title":"Morph Rate"},"name":"morph_rate","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/sing_frame_audio_query":{"post":{"tags":["クエリ作成"],"summary":"歌唱音声合成用のクエリを作成する","description":"歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"sing_frame_audio_query_sing_frame_audio_query_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Score"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/FrameAudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/frame_synthesis":{"post":{"tags":["音声合成"],"summary":"Frame Synthesis","description":"歌唱音声合成を行います。","operationId":"frame_synthesis_frame_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/FrameAudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/connect_waves":{"post":{"tags":["その他"],"summary":"base64エンコードされた複数のwavデータを一つに結合する","description":"base64エンコードされたwavデータを一纏めにし、wavファイルで返します。","operationId":"connect_waves_connect_waves_post","requestBody":{"content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Waves"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/presets":{"get":{"tags":["その他"],"summary":"Get Presets","description":"エンジンが保持しているプリセットの設定を返します\n\nReturns\n-------\npresets: list[Preset]\n    プリセットのリスト","operationId":"get_presets_presets_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Preset"},"type":"array","title":"Response Get Presets Presets Get"}}}}}}},"/add_preset":{"post":{"tags":["その他"],"summary":"Add Preset","description":"新しいプリセットを追加します\n\nParameters\n-------\npreset: Preset\n    新しいプリセット。\n    プリセットIDが既存のものと重複している場合は、新規のプリセットIDが採番されます。\n\nReturns\n-------\nid: int\n    追加したプリセットのプリセットID","operationId":"add_preset_add_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Add Preset Add Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/update_preset":{"post":{"tags":["その他"],"summary":"Update Preset","description":"既存のプリセットを更新します\n\nParameters\n-------\npreset: Preset\n    更新するプリセット。\n    プリセットIDが更新対象と一致している必要があります。\n\nReturns\n-------\nid: int\n    更新したプリセットのプリセットID","operationId":"update_preset_update_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Update Preset Update Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/delete_preset":{"post":{"tags":["その他"],"summary":"Delete Preset","description":"既存のプリセットを削除します\n\nParameters\n-------\nid: int\n    削除するプリセットのプリセットID","operationId":"delete_preset_delete_preset_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Id"},"name":"id","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/version":{"get":{"tags":["その他"],"summary":"Version","operationId":"version_version_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Version Version Get"}}}}}}},"/core_versions":{"get":{"tags":["その他"],"summary":"Core Versions","operationId":"core_versions_core_versions_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Response Core Versions Core Versions Get"}}}}}}},"/speakers":{"get":{"tags":["その他"],"summary":"Speakers","operationId":"speakers_speakers_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Speaker"},"type":"array","title":"Response Speakers Speakers Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/speaker_info":{"get":{"tags":["その他"],"summary":"Speaker Info","description":"指定されたspeaker_uuidに関する情報をjson形式で返します。\n画像や音声はbase64エンコードされたものが返されます。\n\nReturns\n-------\nret_data: SpeakerInfo","operationId":"speaker_info_speaker_info_get","parameters":[{"required":true,"schema":{"type":"string","title":"Speaker Uuid"},"name":"speaker_uuid","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SpeakerInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/downloadable_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Downloadable Libraries","description":"ダウンロード可能な音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: list[DownloadableLibrary]","operationId":"downloadable_libraries_downloadable_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/DownloadableLibraryInfo"},"type":"array","title":"Response Downloadable Libraries Downloadable Libraries Get"}}}}}}},"/installed_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Installed Libraries","description":"インストールした音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: dict[str, InstalledLibrary]","operationId":"installed_libraries_installed_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/InstalledLibraryInfo"},"type":"object","title":"Response Installed Libraries Installed Libraries Get"}}}}}}},"/install_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Install Library","description":"音声ライブラリをインストールします。\n音声ライブラリのZIPファイルをリクエストボディとして送信してください。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"install_library_install_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/uninstall_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Uninstall Library","description":"音声ライブラリをアンインストールします。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"uninstall_library_uninstall_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_style_id":{"post":{"tags":["その他"],"summary":"Initialize Style Id","description":"指定されたstyle_idのスタイルを初期化します。\n実行しなくても他のAPIは使用できますが、初回実行時に時間がかかることがあります。","operationId":"initialize_style_id_initialize_style_id_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","required":false,"schema":{"type":"boolean","title":"Skip Reinit","description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/is_initialized_style_id":{"get":{"tags":["その他"],"summary":"Is Initialized Style Id","description":"指定されたstyle_idのスタイルが初期化されているかどうかを返します。","operationId":"is_initialized_style_id_is_initialized_style_id_get","parameters":[{"required":true,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Is Initialized Style Id Is Initialized Style Id Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_speaker":{"post":{"tags":["その他"],"summary":"Initialize Speaker","description":"こちらのAPIは非推奨です。`initialize_style_id`を利用してください。","operationId":"initialize_speaker_initialize_speaker_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"既に初期化済みの話者の再初期化をスキップするかどうか","required":false,"schema":{"type":"boolean","title":"Skip Reinit","description":"既に初期化済みの話者の再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}},"deprecated":true}},"/is_initialized_speaker":{"get":{"tags":["その他"],"summary":"Is Initialized Speaker","description":"こちらのAPIは非推奨です。`is_initialize_style_id`を利用してください。","operationId":"is_initialized_speaker_is_initialized_speaker_get","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Is Initialized Speaker Is Initialized Speaker Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}},"deprecated":true}},"/user_dict":{"get":{"tags":["ユーザー辞書"],"summary":"Get User Dict Words","description":"ユーザー辞書に登録されている単語の一覧を返します。\n単語の表層形(surface)は正規化済みの物を返します。\n\nReturns\n-------\ndict[str, UserDictWord]\n    単語のUUIDとその詳細","operationId":"get_user_dict_words_user_dict_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Response Get User Dict Words User Dict Get"}}}}}}},"/user_dict_word":{"post":{"tags":["ユーザー辞書"],"summary":"Add User Dict Word","description":"ユーザー辞書に言葉を追加します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"add_user_dict_word_user_dict_word_post","parameters":[{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Add User Dict Word User Dict Word Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict_word/{word_uuid}":{"put":{"tags":["ユーザー辞書"],"summary":"Rewrite User Dict Word","description":"ユーザー辞書に登録されている言葉を更新します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_uuid: str\n    更新する言葉のUUID\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"rewrite_user_dict_word_user_dict_word__word_uuid__put","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"},{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}},"delete":{"tags":["ユーザー辞書"],"summary":"Delete User Dict Word","description":"ユーザー辞書に登録されている言葉を削除します。\n\nParameters\n----------\nword_uuid: str\n    削除する言葉のUUID","operationId":"delete_user_dict_word_user_dict_word__word_uuid__delete","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/import_user_dict":{"post":{"tags":["ユーザー辞書"],"summary":"Import User Dict Words","description":"他のユーザー辞書をインポートします。\n\nParameters\n----------\nimport_dict_data: dict[str, UserDictWord]\n    インポートするユーザー辞書のデータ\noverride: bool\n    重複したエントリがあった場合、上書きするかどうか","operationId":"import_user_dict_words_import_user_dict_post","parameters":[{"required":true,"schema":{"type":"boolean","title":"Override"},"name":"override","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Import Dict Data"}}},"required":true},"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/supported_devices":{"get":{"tags":["その他"],"summary":"Supported Devices","operationId":"supported_devices_supported_devices_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SupportedDevicesInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/engine_manifest":{"get":{"tags":["その他"],"summary":"Engine Manifest","operationId":"engine_manifest_engine_manifest_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/EngineManifest"}}}}}}},"/validate_kana":{"post":{"tags":["その他"],"summary":"テキストがAquesTalk 風記法に従っているか判定する","description":"テキストがAquesTalk 風記法に従っているかどうかを判定します。\n従っていない場合はエラーが返ります。\n\nParameters\n----------\ntext: str\n    判定する対象の文字列","operationId":"validate_kana_validate_kana_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Validate Kana Validate Kana Post"}}}},"400":{"description":"テキストが不正です","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/setting":{"get":{"tags":["設定"],"summary":"Setting Get","description":"設定ページを返します。","operationId":"setting_get_setting_get","responses":{"200":{"description":"Successful Response"}}},"post":{"tags":["設定"],"summary":"Setting Post","description":"設定を更新します。","operationId":"setting_post_setting_post","requestBody":{"content":{"application/x-www-form-urlencoded":{"schema":{"$ref":"#/components/schemas/Body_setting_post_setting_post"}}},"required":true},"responses":{"200":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}}},"components":{"schemas":{"AccentPhrase":{"properties":{"moras":{"items":{"$ref":"#/components/schemas/Mora"},"type":"array","title":"モーラのリスト"},"accent":{"type":"integer","title":"アクセント箇所"},"pause_mora":{"allOf":[{"$ref":"#/components/schemas/Mora"}],"title":"後ろに無音を付けるかどうか"},"is_interrogative":{"type":"boolean","title":"疑問系かどうか","default":false}},"type":"object","required":["moras","accent"],"title":"AccentPhrase","description":"アクセント句ごとの情報"},"AudioQuery":{"properties":{"accent_phrases":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"アクセント句のリスト"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"},"outputSamplingRate":{"type":"integer","title":"音声データの出力サンプリングレート"},"outputStereo":{"type":"boolean","title":"音声データをステレオ出力するか否か"},"kana":{"type":"string","title":"[読み取り専用]AquesTalk 風記法によるテキスト。音声合成用のクエリとしては無視される"}},"type":"object","required":["accent_phrases","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength","outputSamplingRate","outputStereo"],"title":"AudioQuery","description":"音声合成用のクエリ"},"Body_setting_post_setting_post":{"properties":{"cors_policy_mode":{"$ref":"#/components/schemas/CorsPolicyMode"},"allow_origin":{"type":"string","title":"Allow Origin"}},"type":"object","required":["cors_policy_mode"],"title":"Body_setting_post_setting_post"},"CorsPolicyMode":{"type":"string","enum":["all","localapps"],"title":"CorsPolicyMode","description":"CORSの許可モード"},"DownloadableLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers"],"title":"DownloadableLibraryInfo","description":"ダウンロード可能な音声ライブラリの情報"},"EngineManifest":{"properties":{"manifest_version":{"type":"string","title":"マニフェストのバージョン"},"name":{"type":"string","title":"エンジン名"},"brand_name":{"type":"string","title":"ブランド名"},"uuid":{"type":"string","title":"エンジンのUUID"},"url":{"type":"string","title":"エンジンのURL"},"icon":{"type":"string","title":"エンジンのアイコンをBASE64エンコードしたもの"},"default_sampling_rate":{"type":"integer","title":"デフォルトのサンプリング周波数"},"frame_rate":{"type":"number","title":"エンジンのフレームレート"},"terms_of_service":{"type":"string","title":"エンジンの利用規約"},"update_infos":{"items":{"$ref":"#/components/schemas/UpdateInfo"},"type":"array","title":"エンジンのアップデート情報"},"dependency_licenses":{"items":{"$ref":"#/components/schemas/LicenseInfo"},"type":"array","title":"依存関係のライセンス情報"},"supported_vvlib_manifest_version":{"type":"string","title":"エンジンが対応するvvlibのバージョン"},"supported_features":{"allOf":[{"$ref":"#/components/schemas/SupportedFeatures"}],"title":"エンジンが持つ機能"}},"type":"object","required":["manifest_version","name","brand_name","uuid","url","icon","default_sampling_rate","frame_rate","terms_of_service","update_infos","dependency_licenses","supported_features"],"title":"EngineManifest","description":"エンジン自体に関する情報"},"FrameAudioQuery":{"properties":{"f0":{"items":{"type":"number"},"type":"array","title":"フレームごとの基本周波数"},"volume":{"items":{"type":"number"},"type":"array","title":"フレームごとの音量"},"phonemes":{"items":{"$ref":"#/components/schemas/FramePhoneme"},"type":"array","title":"音素のリスト"},"volumeScale":{"type":"number","title":"全体の音量"},"outputSamplingRate":{"type":"integer","title":"音声データの出力サンプリングレート"},"outputStereo":{"type":"boolean","title":"音声データをステレオ出力するか否か"}},"type":"object","required":["f0","volume","phonemes","volumeScale","outputSamplingRate","outputStereo"],"title":"FrameAudioQuery","description":"フレームごとの音声合成用のクエリ"},"FramePhoneme":{"properties":{"phoneme":{"type":"string","title":"音素"},"frame_length":{"type":"integer","title":"音素のフレーム長"}},"type":"object","required":["phoneme","frame_length"],"title":"FramePhoneme","description":"音素の情報"},"HTTPValidationError":{"properties":{"detail":{"items":{"$ref":"#/components/schemas/ValidationError"},"type":"array","title":"Detail"}},"type":"object","title":"HTTPValidationError"},"InstalledLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"},"uninstallable":{"type":"boolean","title":"アンインストール可能かどうか"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers","uninstallable"],"title":"InstalledLibraryInfo","description":"インストール済み音声ライブラリの情報"},"LibrarySpeaker":{"properties":{"speaker":{"allOf":[{"$ref":"#/components/schemas/Speaker"}],"title":"話者情報"},"speaker_info":{"allOf":[{"$ref":"#/components/schemas/SpeakerInfo"}],"title":"話者の追加情報"}},"type":"object","required":["speaker","speaker_info"],"title":"LibrarySpeaker","description":"音声ライブラリに含まれる話者の情報"},"LicenseInfo":{"properties":{"name":{"type":"string","title":"依存ライブラリ名"},"version":{"type":"string","title":"依存ライブラリのバージョン"},"license":{"type":"string","title":"依存ライブラリのライセンス名"},"text":{"type":"string","title":"依存ライブラリのライセンス本文"}},"type":"object","required":["name","text"],"title":"LicenseInfo","description":"依存ライブラリのライセンス情報"},"Mora":{"properties":{"text":{"type":"string","title":"文字"},"consonant":{"type":"string","title":"子音の音素"},"consonant_length":{"type":"number","title":"子音の音長"},"vowel":{"type":"string","title":"母音の音素"},"vowel_length":{"type":"number","title":"母音の音長"},"pitch":{"type":"number","title":"音高"}},"type":"object","required":["text","vowel","vowel_length","pitch"],"title":"Mora","description":"モーラ（子音＋母音）ごとの情報"},"MorphableTargetInfo":{"properties":{"is_morphable":{"type":"boolean","title":"指定した話者に対してモーフィングの可否"}},"type":"object","required":["is_morphable"],"title":"MorphableTargetInfo"},"Note":{"properties":{"key":{"type":"integer","title":"音階"},"frame_length":{"type":"integer","title":"音符のフレーム長"},"lyric":{"type":"string","title":"音符の歌詞"}},"type":"object","required":["frame_length","lyric"],"title":"Note","description":"音符ごとの情報"},"ParseKanaBadRequest":{"properties":{"text":{"type":"string","title":"エラーメッセージ"},"error_name":{"type":"string","title":"エラー名","description":"|name|description|\n|---|---|\n| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |\n| ACCENT_TOP | 句頭にアクセントは置けません: {text} |\n| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |\n| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |\n| EMPTY_PHRASE | {position}番目のアクセント句が空白です |\n| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |\n| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |"},"error_args":{"additionalProperties":{"type":"string"},"type":"object","title":"エラーを起こした箇所"}},"type":"object","required":["text","error_name","error_args"],"title":"ParseKanaBadRequest"},"Preset":{"properties":{"id":{"type":"integer","title":"プリセットID"},"name":{"type":"string","title":"プリセット名"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"style_id":{"type":"integer","title":"スタイルID"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"}},"type":"object","required":["id","name","speaker_uuid","style_id","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength"],"title":"Preset","description":"プリセット情報"},"Score":{"properties":{"notes":{"items":{"$ref":"#/components/schemas/Note"},"type":"array","title":"音符のリスト"}},"type":"object","required":["notes"],"title":"Score","description":"楽譜情報"},"Speaker":{"properties":{"supported_features":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportedFeatures"}],"title":"話者の対応機能"},"name":{"type":"string","title":"名前"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"styles":{"items":{"$ref":"#/components/schemas/SpeakerStyle"},"type":"array","title":"スタイルの一覧"},"version":{"type":"string","title":"Version","default":"話者のバージョン"}},"type":"object","required":["name","speaker_uuid","styles"],"title":"Speaker","description":"話者情報"},"SpeakerInfo":{"properties":{"policy":{"type":"string","title":"policy.md"},"portrait":{"type":"string","title":"portrait.pngをbase64エンコードしたもの"},"style_infos":{"items":{"$ref":"#/components/schemas/StyleInfo"},"type":"array","title":"スタイルの追加情報"}},"type":"object","required":["policy","portrait","style_infos"],"title":"SpeakerInfo","description":"話者の追加情報"},"SpeakerStyle":{"properties":{"name":{"type":"string","title":"スタイル名"},"id":{"type":"integer","title":"スタイルID"},"type":{"type":"string","enum":["talk","humming","sing_teacher"],"title":"モデルの種類"}},"type":"object","required":["name","id"],"title":"SpeakerStyle","description":"話者のスタイル情報"},"SpeakerSupportPermittedSynthesisMorphing":{"type":"string","enum":["ALL","SELF_ONLY","NOTHING"],"title":"SpeakerSupportPermittedSynthesisMorphing","description":"An enumeration."},"SpeakerSupportedFeatures":{"properties":{"permitted_synthesis_morphing":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportPermittedSynthesisMorphing"}],"title":"モーフィング機能への対応","default":"ALL"}},"type":"object","title":"SpeakerSupportedFeatures","description":"話者の対応機能の情報"},"StyleInfo":{"properties":{"id":{"type":"integer","title":"スタイルID"},"icon":{"type":"string","title":"当該スタイルのアイコンをbase64エンコードしたもの"},"portrait":{"type":"string","title":"当該スタイルのportrait.pngをbase64エンコードしたもの"},"voice_samples":{"items":{"type":"string"},"type":"array","title":"voice_sampleのwavファイルをbase64エンコードしたもの"}},"type":"object","required":["id","icon","voice_samples"],"title":"StyleInfo","description":"スタイルの追加情報"},"SupportedDevicesInfo":{"properties":{"cpu":{"type":"boolean","title":"CPUに対応しているか"},"cuda":{"type":"boolean","title":"CUDA(Nvidia GPU)に対応しているか"},"dml":{"type":"boolean","title":"DirectML(Nvidia GPU/Radeon GPU等)に対応しているか"}},"type":"object","required":["cpu","cuda","dml"],"title":"SupportedDevicesInfo","description":"対応しているデバイスの情報"},"SupportedFeatures":{"properties":{"adjust_mora_pitch":{"type":"boolean","title":"モーラごとの音高の調整"},"adjust_phoneme_length":{"type":"boolean","title":"音素ごとの長さの調整"},"adjust_speed_scale":{"type":"boolean","title":"全体の話速の調整"},"adjust_pitch_scale":{"type":"boolean","title":"全体の音高の調整"},"adjust_intonation_scale":{"type":"boolean","title":"全体の抑揚の調整"},"adjust_volume_scale":{"type":"boolean","title":"全体の音量の調整"},"interrogative_upspeak":{"type":"boolean","title":"疑問文の自動調整"},"synthesis_morphing":{"type":"boolean","title":"2種類のスタイルでモーフィングした音声を合成"},"manage_library":{"type":"boolean","title":"音声ライブラリのインストール・アンインストール"}},"type":"object","required":["adjust_mora_pitch","adjust_phoneme_length","adjust_speed_scale","adjust_pitch_scale","adjust_intonation_scale","adjust_volume_scale","interrogative_upspeak","synthesis_morphing"],"title":"SupportedFeatures","description":"エンジンが持つ機能の一覧"},"UpdateInfo":{"properties":{"version":{"type":"string","title":"エンジンのバージョン名"},"descriptions":{"items":{"type":"string"},"type":"array","title":"アップデートの詳細についての説明"},"contributors":{"items":{"type":"string"},"type":"array","title":"貢献者名"}},"type":"object","required":["version","descriptions"],"title":"UpdateInfo","description":"エンジンのアップデート情報"},"UserDictWord":{"properties":{"surface":{"type":"string","title":"表層形"},"priority":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"優先度"},"context_id":{"type":"integer","title":"文脈ID","default":1348},"part_of_speech":{"type":"string","title":"品詞"},"part_of_speech_detail_1":{"type":"string","title":"品詞細分類1"},"part_of_speech_detail_2":{"type":"string","title":"品詞細分類2"},"part_of_speech_detail_3":{"type":"string","title":"品詞細分類3"},"inflectional_type":{"type":"string","title":"活用型"},"inflectional_form":{"type":"string","title":"活用形"},"stem":{"type":"string","title":"原形"},"yomi":{"type":"string","title":"読み"},"pronunciation":{"type":"string","title":"発音"},"accent_type":{"type":"integer","title":"アクセント型"},"mora_count":{"type":"integer","title":"モーラ数"},"accent_associative_rule":{"type":"string","title":"アクセント結合規則"}},"type":"object","required":["surface","priority","part_of_speech","part_of_speech_detail_1","part_of_speech_detail_2","part_of_speech_detail_3","inflectional_type","inflectional_form","stem","yomi","pronunciation","accent_type","accent_associative_rule"],"title":"UserDictWord","description":"辞書のコンパイルに使われる情報"},"ValidationError":{"properties":{"loc":{"items":{"anyOf":[{"type":"string"},{"type":"integer"}]},"type":"array","title":"Location"},"msg":{"type":"string","title":"Message"},"type":{"type":"string","title":"Error Type"}},"type":"object","required":["loc","msg","type"],"title":"ValidationError"},"WordTypes":{"type":"string","enum":["PROPER_NOUN","COMMON_NOUN","VERB","ADJECTIVE","SUFFIX"],"title":"WordTypes","description":"fastapiでword_type引数を検証する時に使用するクラス"},"VvlibManifest":{"title":"VvlibManifest","description":"vvlib(VOICEVOX Library)に関する情報","type":"object","properties":{"manifest_version":{"title":"マニフェストバージョン","type":"string"},"name":{"title":"音声ライブラリ名","type":"string"},"version":{"title":"音声ライブラリバージョン","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"brand_name":{"title":"エンジンのブランド名","type":"string"},"engine_name":{"title":"エンジン名","type":"string"},"engine_uuid":{"title":"エンジンのUUID","type":"string"}},"required":["manifest_version","name","version","uuid","brand_name","engine_name","engine_uuid"]},"BaseLibraryInfo":{"title":"BaseLibraryInfo","description":"音声ライブラリの情報","type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}}},"required":["name","uuid","version","download_url","bytes","speakers"]}}}}
\ No newline at end of file
diff --git a/src/openapi/.openapi-generator/FILES b/src/openapi/.openapi-generator/FILES
index 3d12c853e3..074f138308 100644
--- a/src/openapi/.openapi-generator/FILES
+++ b/src/openapi/.openapi-generator/FILES
@@ -7,15 +7,18 @@ models/BaseLibraryInfo.ts
 models/CorsPolicyMode.ts
 models/DownloadableLibraryInfo.ts
 models/EngineManifest.ts
+models/FrameAudioQuery.ts
+models/FramePhoneme.ts
 models/HTTPValidationError.ts
 models/InstalledLibraryInfo.ts
 models/LibrarySpeaker.ts
 models/LicenseInfo.ts
 models/Mora.ts
 models/MorphableTargetInfo.ts
+models/Note.ts
 models/ParseKanaBadRequest.ts
-models/PeriodicData.ts
 models/Preset.ts
+models/Score.ts
 models/Speaker.ts
 models/SpeakerInfo.ts
 models/SpeakerStyle.ts
diff --git a/src/openapi/apis/DefaultApi.ts b/src/openapi/apis/DefaultApi.ts
index 9291688215..d0d93bf8c0 100644
--- a/src/openapi/apis/DefaultApi.ts
+++ b/src/openapi/apis/DefaultApi.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -20,11 +20,13 @@ import type {
   CorsPolicyMode,
   DownloadableLibraryInfo,
   EngineManifest,
+  FrameAudioQuery,
   HTTPValidationError,
   InstalledLibraryInfo,
   MorphableTargetInfo,
   ParseKanaBadRequest,
   Preset,
+  Score,
   Speaker,
   SpeakerInfo,
   SupportedDevicesInfo,
@@ -42,6 +44,8 @@ import {
     DownloadableLibraryInfoToJSON,
     EngineManifestFromJSON,
     EngineManifestToJSON,
+    FrameAudioQueryFromJSON,
+    FrameAudioQueryToJSON,
     HTTPValidationErrorFromJSON,
     HTTPValidationErrorToJSON,
     InstalledLibraryInfoFromJSON,
@@ -52,6 +56,8 @@ import {
     ParseKanaBadRequestToJSON,
     PresetFromJSON,
     PresetToJSON,
+    ScoreFromJSON,
+    ScoreToJSON,
     SpeakerFromJSON,
     SpeakerToJSON,
     SpeakerInfoFromJSON,
@@ -116,6 +122,13 @@ export interface DeleteUserDictWordUserDictWordWordUuidDeleteRequest {
     wordUuid: string;
 }
 
+export interface FrameSynthesisFrameSynthesisPostRequest {
+    frameAudioQuery: FrameAudioQuery;
+    styleId?: number;
+    speaker?: number;
+    coreVersion?: string;
+}
+
 export interface ImportUserDictWordsImportUserDictPostRequest {
     override: boolean;
     requestBody: { [key: string]: UserDictWord; } | null;
@@ -180,12 +193,6 @@ export interface MultiSynthesisMultiSynthesisPostRequest {
     coreVersion?: string;
 }
 
-export interface PeriodicPitchPeriodicPitchPostRequest {
-    speaker: number;
-    audioQuery: AudioQuery;
-    coreVersion?: string;
-}
-
 export interface RewriteUserDictWordUserDictWordWordUuidPutRequest {
     wordUuid: string;
     surface: string;
@@ -200,6 +207,13 @@ export interface SettingPostSettingPostRequest {
     allowOrigin?: string;
 }
 
+export interface SingFrameAudioQuerySingFrameAudioQueryPostRequest {
+    score: Score;
+    styleId?: number;
+    speaker?: number;
+    coreVersion?: string;
+}
+
 export interface SpeakerInfoSpeakerInfoGetRequest {
     speakerUuid: string;
     coreVersion?: string;
@@ -452,6 +466,25 @@ export interface DefaultApiInterface {
      */
     engineManifestEngineManifestGet(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<EngineManifest>;
 
+    /**
+     * 歌唱音声合成を行います。
+     * @summary Frame Synthesis
+     * @param {FrameAudioQuery} frameAudioQuery 
+     * @param {number} [styleId] 
+     * @param {number} [speaker] 
+     * @param {string} [coreVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof DefaultApiInterface
+     */
+    frameSynthesisFrameSynthesisPostRaw(requestParameters: FrameSynthesisFrameSynthesisPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Blob>>;
+
+    /**
+     * 歌唱音声合成を行います。
+     * Frame Synthesis
+     */
+    frameSynthesisFrameSynthesisPost(requestParameters: FrameSynthesisFrameSynthesisPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Blob>;
+
     /**
      * エンジンが保持しているプリセットの設定を返します  Returns ------- presets: list[Preset]     プリセットのリスト
      * @summary Get Presets
@@ -693,23 +726,6 @@ export interface DefaultApiInterface {
      */
     multiSynthesisMultiSynthesisPost(requestParameters: MultiSynthesisMultiSynthesisPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Blob>;
 
-    /**
-     * 
-     * @summary 音声合成用のクエリから音高の時系列を得る
-     * @param {number} speaker 
-     * @param {AudioQuery} audioQuery 
-     * @param {string} [coreVersion] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof DefaultApiInterface
-     */
-    periodicPitchPeriodicPitchPostRaw(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<AudioQuery>>;
-
-    /**
-     * 音声合成用のクエリから音高の時系列を得る
-     */
-    periodicPitchPeriodicPitchPost(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<AudioQuery>;
-
     /**
      * ユーザー辞書に登録されている言葉を更新します。  Parameters ---------- surface : str     言葉の表層形 pronunciation: str     言葉の発音（カタカナ） accent_type: int     アクセント型（音が下がる場所を指す） word_uuid: str     更新する言葉のUUID word_type: WordTypes, optional     PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか priority: int, optional     単語の優先度（0から10までの整数）     数字が大きいほど優先度が高くなる     1から9までの値を指定することを推奨
      * @summary Rewrite User Dict Word
@@ -763,6 +779,25 @@ export interface DefaultApiInterface {
      */
     settingPostSettingPost(requestParameters: SettingPostSettingPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
 
+    /**
+     * 歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。
+     * @summary 歌唱音声合成用のクエリを作成する
+     * @param {Score} score 
+     * @param {number} [styleId] 
+     * @param {number} [speaker] 
+     * @param {string} [coreVersion] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof DefaultApiInterface
+     */
+    singFrameAudioQuerySingFrameAudioQueryPostRaw(requestParameters: SingFrameAudioQuerySingFrameAudioQueryPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FrameAudioQuery>>;
+
+    /**
+     * 歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。
+     * 歌唱音声合成用のクエリを作成する
+     */
+    singFrameAudioQuerySingFrameAudioQueryPost(requestParameters: SingFrameAudioQuerySingFrameAudioQueryPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<FrameAudioQuery>;
+
     /**
      * 指定されたspeaker_uuidに関する情報をjson形式で返します。 画像や音声はbase64エンコードされたものが返されます。  Returns ------- ret_data: SpeakerInfo
      * @summary Speaker Info
@@ -1397,6 +1432,53 @@ export class DefaultApi extends runtime.BaseAPI implements DefaultApiInterface {
         return await response.value();
     }
 
+    /**
+     * 歌唱音声合成を行います。
+     * Frame Synthesis
+     */
+    async frameSynthesisFrameSynthesisPostRaw(requestParameters: FrameSynthesisFrameSynthesisPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Blob>> {
+        if (requestParameters.frameAudioQuery === null || requestParameters.frameAudioQuery === undefined) {
+            throw new runtime.RequiredError('frameAudioQuery','Required parameter requestParameters.frameAudioQuery was null or undefined when calling frameSynthesisFrameSynthesisPost.');
+        }
+
+        const queryParameters: any = {};
+
+        if (requestParameters.styleId !== undefined) {
+            queryParameters['style_id'] = requestParameters.styleId;
+        }
+
+        if (requestParameters.speaker !== undefined) {
+            queryParameters['speaker'] = requestParameters.speaker;
+        }
+
+        if (requestParameters.coreVersion !== undefined) {
+            queryParameters['core_version'] = requestParameters.coreVersion;
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/frame_synthesis`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: FrameAudioQueryToJSON(requestParameters.frameAudioQuery),
+        }, initOverrides);
+
+        return new runtime.BlobApiResponse(response);
+    }
+
+    /**
+     * 歌唱音声合成を行います。
+     * Frame Synthesis
+     */
+    async frameSynthesisFrameSynthesisPost(requestParameters: FrameSynthesisFrameSynthesisPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Blob> {
+        const response = await this.frameSynthesisFrameSynthesisPostRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
     /**
      * エンジンが保持しているプリセットの設定を返します  Returns ------- presets: list[Preset]     プリセットのリスト
      * Get Presets
@@ -1951,51 +2033,6 @@ export class DefaultApi extends runtime.BaseAPI implements DefaultApiInterface {
         return await response.value();
     }
 
-    /**
-     * 音声合成用のクエリから音高の時系列を得る
-     */
-    async periodicPitchPeriodicPitchPostRaw(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<AudioQuery>> {
-        if (requestParameters.speaker === null || requestParameters.speaker === undefined) {
-            throw new runtime.RequiredError('speaker','Required parameter requestParameters.speaker was null or undefined when calling periodicPitchPeriodicPitchPost.');
-        }
-
-        if (requestParameters.audioQuery === null || requestParameters.audioQuery === undefined) {
-            throw new runtime.RequiredError('audioQuery','Required parameter requestParameters.audioQuery was null or undefined when calling periodicPitchPeriodicPitchPost.');
-        }
-
-        const queryParameters: any = {};
-
-        if (requestParameters.speaker !== undefined) {
-            queryParameters['speaker'] = requestParameters.speaker;
-        }
-
-        if (requestParameters.coreVersion !== undefined) {
-            queryParameters['core_version'] = requestParameters.coreVersion;
-        }
-
-        const headerParameters: runtime.HTTPHeaders = {};
-
-        headerParameters['Content-Type'] = 'application/json';
-
-        const response = await this.request({
-            path: `/periodic_pitch`,
-            method: 'POST',
-            headers: headerParameters,
-            query: queryParameters,
-            body: AudioQueryToJSON(requestParameters.audioQuery),
-        }, initOverrides);
-
-        return new runtime.JSONApiResponse(response, (jsonValue) => AudioQueryFromJSON(jsonValue));
-    }
-
-    /**
-     * 音声合成用のクエリから音高の時系列を得る
-     */
-    async periodicPitchPeriodicPitchPost(requestParameters: PeriodicPitchPeriodicPitchPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<AudioQuery> {
-        const response = await this.periodicPitchPeriodicPitchPostRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-
     /**
      * ユーザー辞書に登録されている言葉を更新します。  Parameters ---------- surface : str     言葉の表層形 pronunciation: str     言葉の発音（カタカナ） accent_type: int     アクセント型（音が下がる場所を指す） word_uuid: str     更新する言葉のUUID word_type: WordTypes, optional     PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか priority: int, optional     単語の優先度（0から10までの整数）     数字が大きいほど優先度が高くなる     1から9までの値を指定することを推奨
      * Rewrite User Dict Word
@@ -2140,6 +2177,53 @@ export class DefaultApi extends runtime.BaseAPI implements DefaultApiInterface {
         await this.settingPostSettingPostRaw(requestParameters, initOverrides);
     }
 
+    /**
+     * 歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。
+     * 歌唱音声合成用のクエリを作成する
+     */
+    async singFrameAudioQuerySingFrameAudioQueryPostRaw(requestParameters: SingFrameAudioQuerySingFrameAudioQueryPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FrameAudioQuery>> {
+        if (requestParameters.score === null || requestParameters.score === undefined) {
+            throw new runtime.RequiredError('score','Required parameter requestParameters.score was null or undefined when calling singFrameAudioQuerySingFrameAudioQueryPost.');
+        }
+
+        const queryParameters: any = {};
+
+        if (requestParameters.styleId !== undefined) {
+            queryParameters['style_id'] = requestParameters.styleId;
+        }
+
+        if (requestParameters.speaker !== undefined) {
+            queryParameters['speaker'] = requestParameters.speaker;
+        }
+
+        if (requestParameters.coreVersion !== undefined) {
+            queryParameters['core_version'] = requestParameters.coreVersion;
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/sing_frame_audio_query`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: ScoreToJSON(requestParameters.score),
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => FrameAudioQueryFromJSON(jsonValue));
+    }
+
+    /**
+     * 歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。
+     * 歌唱音声合成用のクエリを作成する
+     */
+    async singFrameAudioQuerySingFrameAudioQueryPost(requestParameters: SingFrameAudioQuerySingFrameAudioQueryPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<FrameAudioQuery> {
+        const response = await this.singFrameAudioQuerySingFrameAudioQueryPostRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
     /**
      * 指定されたspeaker_uuidに関する情報をjson形式で返します。 画像や音声はbase64エンコードされたものが返されます。  Returns ------- ret_data: SpeakerInfo
      * Speaker Info
diff --git a/src/openapi/models/AccentPhrase.ts b/src/openapi/models/AccentPhrase.ts
index 3022dff482..9361e65cd1 100644
--- a/src/openapi/models/AccentPhrase.ts
+++ b/src/openapi/models/AccentPhrase.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/AudioQuery.ts b/src/openapi/models/AudioQuery.ts
index cdd62c1fbf..6dfe8177e5 100644
--- a/src/openapi/models/AudioQuery.ts
+++ b/src/openapi/models/AudioQuery.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -19,12 +19,6 @@ import {
     AccentPhraseFromJSONTyped,
     AccentPhraseToJSON,
 } from './AccentPhrase';
-import type { PeriodicData } from './PeriodicData';
-import {
-    PeriodicDataFromJSON,
-    PeriodicDataFromJSONTyped,
-    PeriodicDataToJSON,
-} from './PeriodicData';
 
 /**
  * 音声合成用のクエリ
@@ -38,12 +32,6 @@ export interface AudioQuery {
      * @memberof AudioQuery
      */
     accentPhrases: Array<AccentPhrase>;
-    /**
-     * 
-     * @type {PeriodicData}
-     * @memberof AudioQuery
-     */
-    periodicPitch?: PeriodicData;
     /**
      * 
      * @type {number}
@@ -129,7 +117,6 @@ export function AudioQueryFromJSONTyped(json: any, ignoreDiscriminator: boolean)
     return {
         
         'accentPhrases': ((json['accent_phrases'] as Array<any>).map(AccentPhraseFromJSON)),
-        'periodicPitch': !exists(json, 'periodic_pitch') ? undefined : PeriodicDataFromJSON(json['periodic_pitch']),
         'speedScale': json['speedScale'],
         'pitchScale': json['pitchScale'],
         'intonationScale': json['intonationScale'],
@@ -152,7 +139,6 @@ export function AudioQueryToJSON(value?: AudioQuery | null): any {
     return {
         
         'accent_phrases': ((value.accentPhrases as Array<any>).map(AccentPhraseToJSON)),
-        'periodic_pitch': PeriodicDataToJSON(value.periodicPitch),
         'speedScale': value.speedScale,
         'pitchScale': value.pitchScale,
         'intonationScale': value.intonationScale,
diff --git a/src/openapi/models/EngineManifest.ts b/src/openapi/models/EngineManifest.ts
index e441e6e775..38952d796e 100644
--- a/src/openapi/models/EngineManifest.ts
+++ b/src/openapi/models/EngineManifest.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -80,6 +80,12 @@ export interface EngineManifest {
      * @memberof EngineManifest
      */
     defaultSamplingRate: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof EngineManifest
+     */
+    frameRate: number;
     /**
      * 
      * @type {string}
@@ -124,6 +130,7 @@ export function instanceOfEngineManifest(value: object): boolean {
     isInstance = isInstance && "url" in value;
     isInstance = isInstance && "icon" in value;
     isInstance = isInstance && "defaultSamplingRate" in value;
+    isInstance = isInstance && "frameRate" in value;
     isInstance = isInstance && "termsOfService" in value;
     isInstance = isInstance && "updateInfos" in value;
     isInstance = isInstance && "dependencyLicenses" in value;
@@ -149,6 +156,7 @@ export function EngineManifestFromJSONTyped(json: any, ignoreDiscriminator: bool
         'url': json['url'],
         'icon': json['icon'],
         'defaultSamplingRate': json['default_sampling_rate'],
+        'frameRate': json['frame_rate'],
         'termsOfService': json['terms_of_service'],
         'updateInfos': ((json['update_infos'] as Array<any>).map(UpdateInfoFromJSON)),
         'dependencyLicenses': ((json['dependency_licenses'] as Array<any>).map(LicenseInfoFromJSON)),
@@ -173,6 +181,7 @@ export function EngineManifestToJSON(value?: EngineManifest | null): any {
         'url': value.url,
         'icon': value.icon,
         'default_sampling_rate': value.defaultSamplingRate,
+        'frame_rate': value.frameRate,
         'terms_of_service': value.termsOfService,
         'update_infos': ((value.updateInfos as Array<any>).map(UpdateInfoToJSON)),
         'dependency_licenses': ((value.dependencyLicenses as Array<any>).map(LicenseInfoToJSON)),
diff --git a/src/openapi/models/FrameAudioQuery.ts b/src/openapi/models/FrameAudioQuery.ts
new file mode 100644
index 0000000000..db0e2d0b45
--- /dev/null
+++ b/src/openapi/models/FrameAudioQuery.ts
@@ -0,0 +1,118 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * VOICEVOX Engine
+ * VOICEVOXの音声合成エンジンです。
+ *
+ * The version of the OpenAPI document: latest
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import type { FramePhoneme } from './FramePhoneme';
+import {
+    FramePhonemeFromJSON,
+    FramePhonemeFromJSONTyped,
+    FramePhonemeToJSON,
+} from './FramePhoneme';
+
+/**
+ * フレームごとの音声合成用のクエリ
+ * @export
+ * @interface FrameAudioQuery
+ */
+export interface FrameAudioQuery {
+    /**
+     * 
+     * @type {Array<number>}
+     * @memberof FrameAudioQuery
+     */
+    f0: Array<number>;
+    /**
+     * 
+     * @type {Array<number>}
+     * @memberof FrameAudioQuery
+     */
+    volume: Array<number>;
+    /**
+     * 
+     * @type {Array<FramePhoneme>}
+     * @memberof FrameAudioQuery
+     */
+    phonemes: Array<FramePhoneme>;
+    /**
+     * 
+     * @type {number}
+     * @memberof FrameAudioQuery
+     */
+    volumeScale: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof FrameAudioQuery
+     */
+    outputSamplingRate: number;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof FrameAudioQuery
+     */
+    outputStereo: boolean;
+}
+
+/**
+ * Check if a given object implements the FrameAudioQuery interface.
+ */
+export function instanceOfFrameAudioQuery(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "f0" in value;
+    isInstance = isInstance && "volume" in value;
+    isInstance = isInstance && "phonemes" in value;
+    isInstance = isInstance && "volumeScale" in value;
+    isInstance = isInstance && "outputSamplingRate" in value;
+    isInstance = isInstance && "outputStereo" in value;
+
+    return isInstance;
+}
+
+export function FrameAudioQueryFromJSON(json: any): FrameAudioQuery {
+    return FrameAudioQueryFromJSONTyped(json, false);
+}
+
+export function FrameAudioQueryFromJSONTyped(json: any, ignoreDiscriminator: boolean): FrameAudioQuery {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'f0': json['f0'],
+        'volume': json['volume'],
+        'phonemes': ((json['phonemes'] as Array<any>).map(FramePhonemeFromJSON)),
+        'volumeScale': json['volumeScale'],
+        'outputSamplingRate': json['outputSamplingRate'],
+        'outputStereo': json['outputStereo'],
+    };
+}
+
+export function FrameAudioQueryToJSON(value?: FrameAudioQuery | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'f0': value.f0,
+        'volume': value.volume,
+        'phonemes': ((value.phonemes as Array<any>).map(FramePhonemeToJSON)),
+        'volumeScale': value.volumeScale,
+        'outputSamplingRate': value.outputSamplingRate,
+        'outputStereo': value.outputStereo,
+    };
+}
+
diff --git a/src/openapi/models/FramePhoneme.ts b/src/openapi/models/FramePhoneme.ts
new file mode 100644
index 0000000000..417e9546d3
--- /dev/null
+++ b/src/openapi/models/FramePhoneme.ts
@@ -0,0 +1,75 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * VOICEVOX Engine
+ * VOICEVOXの音声合成エンジンです。
+ *
+ * The version of the OpenAPI document: latest
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 音素の情報
+ * @export
+ * @interface FramePhoneme
+ */
+export interface FramePhoneme {
+    /**
+     * 
+     * @type {string}
+     * @memberof FramePhoneme
+     */
+    phoneme: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof FramePhoneme
+     */
+    frameLength: number;
+}
+
+/**
+ * Check if a given object implements the FramePhoneme interface.
+ */
+export function instanceOfFramePhoneme(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "phoneme" in value;
+    isInstance = isInstance && "frameLength" in value;
+
+    return isInstance;
+}
+
+export function FramePhonemeFromJSON(json: any): FramePhoneme {
+    return FramePhonemeFromJSONTyped(json, false);
+}
+
+export function FramePhonemeFromJSONTyped(json: any, ignoreDiscriminator: boolean): FramePhoneme {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'phoneme': json['phoneme'],
+        'frameLength': json['frame_length'],
+    };
+}
+
+export function FramePhonemeToJSON(value?: FramePhoneme | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'phoneme': value.phoneme,
+        'frame_length': value.frameLength,
+    };
+}
+
diff --git a/src/openapi/models/HTTPValidationError.ts b/src/openapi/models/HTTPValidationError.ts
index e55f144aed..75c74fa13b 100644
--- a/src/openapi/models/HTTPValidationError.ts
+++ b/src/openapi/models/HTTPValidationError.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/LibrarySpeaker.ts b/src/openapi/models/LibrarySpeaker.ts
index 9a3eb28115..dcff3ee459 100644
--- a/src/openapi/models/LibrarySpeaker.ts
+++ b/src/openapi/models/LibrarySpeaker.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/LicenseInfo.ts b/src/openapi/models/LicenseInfo.ts
index 41086eed0e..7176e993cb 100644
--- a/src/openapi/models/LicenseInfo.ts
+++ b/src/openapi/models/LicenseInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/Mora.ts b/src/openapi/models/Mora.ts
index 62da76c096..430d8c2983 100644
--- a/src/openapi/models/Mora.ts
+++ b/src/openapi/models/Mora.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/MorphableTargetInfo.ts b/src/openapi/models/MorphableTargetInfo.ts
index c7e98c8dd3..a7627ddb8b 100644
--- a/src/openapi/models/MorphableTargetInfo.ts
+++ b/src/openapi/models/MorphableTargetInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/Note.ts b/src/openapi/models/Note.ts
new file mode 100644
index 0000000000..fd5a715ced
--- /dev/null
+++ b/src/openapi/models/Note.ts
@@ -0,0 +1,83 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * VOICEVOX Engine
+ * VOICEVOXの音声合成エンジンです。
+ *
+ * The version of the OpenAPI document: latest
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 音符ごとの情報
+ * @export
+ * @interface Note
+ */
+export interface Note {
+    /**
+     * 
+     * @type {number}
+     * @memberof Note
+     */
+    key?: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof Note
+     */
+    frameLength: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof Note
+     */
+    lyric: string;
+}
+
+/**
+ * Check if a given object implements the Note interface.
+ */
+export function instanceOfNote(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "frameLength" in value;
+    isInstance = isInstance && "lyric" in value;
+
+    return isInstance;
+}
+
+export function NoteFromJSON(json: any): Note {
+    return NoteFromJSONTyped(json, false);
+}
+
+export function NoteFromJSONTyped(json: any, ignoreDiscriminator: boolean): Note {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'key': !exists(json, 'key') ? undefined : json['key'],
+        'frameLength': json['frame_length'],
+        'lyric': json['lyric'],
+    };
+}
+
+export function NoteToJSON(value?: Note | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'key': value.key,
+        'frame_length': value.frameLength,
+        'lyric': value.lyric,
+    };
+}
+
diff --git a/src/openapi/models/ParseKanaBadRequest.ts b/src/openapi/models/ParseKanaBadRequest.ts
index 8cf961d1af..8cedd507a4 100644
--- a/src/openapi/models/ParseKanaBadRequest.ts
+++ b/src/openapi/models/ParseKanaBadRequest.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -27,14 +27,14 @@ export interface ParseKanaBadRequest {
     text: string;
     /**
      * |name|description|
-|---|---|
-| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |
-| ACCENT_TOP | 句頭にアクセントは置けません: {text} |
-| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |
-| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |
-| EMPTY_PHRASE | {position}番目のアクセント句が空白です |
-| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |
-| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |
+     * |---|---|
+     * | UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |
+     * | ACCENT_TOP | 句頭にアクセントは置けません: {text} |
+     * | ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |
+     * | ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |
+     * | EMPTY_PHRASE | {position}番目のアクセント句が空白です |
+     * | INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |
+     * | INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |
      * @type {string}
      * @memberof ParseKanaBadRequest
      */
diff --git a/src/openapi/models/Preset.ts b/src/openapi/models/Preset.ts
index 35893a0b73..4a7670ffab 100644
--- a/src/openapi/models/Preset.ts
+++ b/src/openapi/models/Preset.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/Score.ts b/src/openapi/models/Score.ts
new file mode 100644
index 0000000000..4bfa57ae6a
--- /dev/null
+++ b/src/openapi/models/Score.ts
@@ -0,0 +1,73 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * VOICEVOX Engine
+ * VOICEVOXの音声合成エンジンです。
+ *
+ * The version of the OpenAPI document: latest
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import type { Note } from './Note';
+import {
+    NoteFromJSON,
+    NoteFromJSONTyped,
+    NoteToJSON,
+} from './Note';
+
+/**
+ * 楽譜情報
+ * @export
+ * @interface Score
+ */
+export interface Score {
+    /**
+     * 
+     * @type {Array<Note>}
+     * @memberof Score
+     */
+    notes: Array<Note>;
+}
+
+/**
+ * Check if a given object implements the Score interface.
+ */
+export function instanceOfScore(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "notes" in value;
+
+    return isInstance;
+}
+
+export function ScoreFromJSON(json: any): Score {
+    return ScoreFromJSONTyped(json, false);
+}
+
+export function ScoreFromJSONTyped(json: any, ignoreDiscriminator: boolean): Score {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'notes': ((json['notes'] as Array<any>).map(NoteFromJSON)),
+    };
+}
+
+export function ScoreToJSON(value?: Score | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'notes': ((value.notes as Array<any>).map(NoteToJSON)),
+    };
+}
+
diff --git a/src/openapi/models/Speaker.ts b/src/openapi/models/Speaker.ts
index 3312332078..83255477f1 100644
--- a/src/openapi/models/Speaker.ts
+++ b/src/openapi/models/Speaker.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SpeakerInfo.ts b/src/openapi/models/SpeakerInfo.ts
index 03b065b1d0..e375fe646b 100644
--- a/src/openapi/models/SpeakerInfo.ts
+++ b/src/openapi/models/SpeakerInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SpeakerStyle.ts b/src/openapi/models/SpeakerStyle.ts
index 1c18ed2330..b611ac0186 100644
--- a/src/openapi/models/SpeakerStyle.ts
+++ b/src/openapi/models/SpeakerStyle.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -31,8 +31,26 @@ export interface SpeakerStyle {
      * @memberof SpeakerStyle
      */
     id: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof SpeakerStyle
+     */
+    type?: SpeakerStyleTypeEnum;
 }
 
+
+/**
+ * @export
+ */
+export const SpeakerStyleTypeEnum = {
+    Talk: 'talk',
+    Humming: 'humming',
+    SingTeacher: 'sing_teacher'
+} as const;
+export type SpeakerStyleTypeEnum = typeof SpeakerStyleTypeEnum[keyof typeof SpeakerStyleTypeEnum];
+
+
 /**
  * Check if a given object implements the SpeakerStyle interface.
  */
@@ -56,6 +74,7 @@ export function SpeakerStyleFromJSONTyped(json: any, ignoreDiscriminator: boolea
         
         'name': json['name'],
         'id': json['id'],
+        'type': !exists(json, 'type') ? undefined : json['type'],
     };
 }
 
@@ -70,6 +89,7 @@ export function SpeakerStyleToJSON(value?: SpeakerStyle | null): any {
         
         'name': value.name,
         'id': value.id,
+        'type': value.type,
     };
 }
 
diff --git a/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts b/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts
index 16393edf17..118ff7b686 100644
--- a/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts
+++ b/src/openapi/models/SpeakerSupportPermittedSynthesisMorphing.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SpeakerSupportedFeatures.ts b/src/openapi/models/SpeakerSupportedFeatures.ts
index 1bcddc5bd5..604cd1833b 100644
--- a/src/openapi/models/SpeakerSupportedFeatures.ts
+++ b/src/openapi/models/SpeakerSupportedFeatures.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/StyleInfo.ts b/src/openapi/models/StyleInfo.ts
index afd59111c5..c5b72ac96a 100644
--- a/src/openapi/models/StyleInfo.ts
+++ b/src/openapi/models/StyleInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SupportedDevicesInfo.ts b/src/openapi/models/SupportedDevicesInfo.ts
index 68b80f434f..4fef6fbb54 100644
--- a/src/openapi/models/SupportedDevicesInfo.ts
+++ b/src/openapi/models/SupportedDevicesInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/SupportedFeatures.ts b/src/openapi/models/SupportedFeatures.ts
index c3139cc4bd..00924b2285 100644
--- a/src/openapi/models/SupportedFeatures.ts
+++ b/src/openapi/models/SupportedFeatures.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/UpdateInfo.ts b/src/openapi/models/UpdateInfo.ts
index 2aece3a334..6e2154765b 100644
--- a/src/openapi/models/UpdateInfo.ts
+++ b/src/openapi/models/UpdateInfo.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/UserDictWord.ts b/src/openapi/models/UserDictWord.ts
index f030c5dc2c..4d2a9c9ace 100644
--- a/src/openapi/models/UserDictWord.ts
+++ b/src/openapi/models/UserDictWord.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/ValidationError.ts b/src/openapi/models/ValidationError.ts
index a60a46f1e7..11f534f675 100644
--- a/src/openapi/models/ValidationError.ts
+++ b/src/openapi/models/ValidationError.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/VvlibManifest.ts b/src/openapi/models/VvlibManifest.ts
index 82f3aba942..a32ffa3db9 100644
--- a/src/openapi/models/VvlibManifest.ts
+++ b/src/openapi/models/VvlibManifest.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/src/openapi/models/WordTypes.ts b/src/openapi/models/WordTypes.ts
index de9245816a..317f9ecafd 100644
--- a/src/openapi/models/WordTypes.ts
+++ b/src/openapi/models/WordTypes.ts
@@ -4,38 +4,38 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
- *
+ * The version of the OpenAPI document: latest
+ * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
+
 /**
  * fastapiでword_type引数を検証する時に使用するクラス
  * @export
  */
 export const WordTypes = {
-  ProperNoun: "PROPER_NOUN",
-  CommonNoun: "COMMON_NOUN",
-  Verb: "VERB",
-  Adjective: "ADJECTIVE",
-  Suffix: "SUFFIX",
+    ProperNoun: 'PROPER_NOUN',
+    CommonNoun: 'COMMON_NOUN',
+    Verb: 'VERB',
+    Adjective: 'ADJECTIVE',
+    Suffix: 'SUFFIX'
 } as const;
 export type WordTypes = typeof WordTypes[keyof typeof WordTypes];
 
+
 export function WordTypesFromJSON(json: any): WordTypes {
-  return WordTypesFromJSONTyped(json, false);
+    return WordTypesFromJSONTyped(json, false);
 }
 
-export function WordTypesFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): WordTypes {
-  return json as WordTypes;
+export function WordTypesFromJSONTyped(json: any, ignoreDiscriminator: boolean): WordTypes {
+    return json as WordTypes;
 }
 
 export function WordTypesToJSON(value?: WordTypes | null): any {
-  return value as any;
+    return value as any;
 }
+
diff --git a/src/openapi/models/index.ts b/src/openapi/models/index.ts
index a6e16af45e..804de0ee19 100644
--- a/src/openapi/models/index.ts
+++ b/src/openapi/models/index.ts
@@ -6,15 +6,18 @@ export * from './BaseLibraryInfo';
 export * from './CorsPolicyMode';
 export * from './DownloadableLibraryInfo';
 export * from './EngineManifest';
+export * from './FrameAudioQuery';
+export * from './FramePhoneme';
 export * from './HTTPValidationError';
 export * from './InstalledLibraryInfo';
 export * from './LibrarySpeaker';
 export * from './LicenseInfo';
 export * from './Mora';
 export * from './MorphableTargetInfo';
+export * from './Note';
 export * from './ParseKanaBadRequest';
-export * from './PeriodicData';
 export * from './Preset';
+export * from './Score';
 export * from './Speaker';
 export * from './SpeakerInfo';
 export * from './SpeakerStyle';
diff --git a/src/openapi/runtime.ts b/src/openapi/runtime.ts
index b01082db62..865b082d87 100644
--- a/src/openapi/runtime.ts
+++ b/src/openapi/runtime.ts
@@ -4,7 +4,7 @@
  * VOICEVOX Engine
  * VOICEVOXの音声合成エンジンです。
  *
- * The version of the OpenAPI document: 0.15.0-projects.3
+ * The version of the OpenAPI document: latest
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

From 8b52f6f37c21bc1d60c9499f0694119fb7788414 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 21 Jan 2024 04:20:56 +0900
Subject: [PATCH 48/59] =?UTF-8?q?[project-s]=20=E3=83=8F=E3=83=9F=E3=83=B3?=
 =?UTF-8?q?=E3=82=B0=E5=AF=BE=E5=BF=9C=E3=81=AE=E3=82=A8=E3=83=B3=E3=82=B8?=
 =?UTF-8?q?=E3=83=B3=E3=81=A7=E3=83=AC=E3=83=B3=E3=83=80=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=B0=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=20(#1728)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 一旦コミット

* 一旦コミット

* 修正

* 修正とリファクタリング

* 開始時刻を計算する処理を修正

* Update src/store/singing.ts

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/components/Sing/MenuBar.vue        |   4 +-
 src/components/Sing/ScoreSequencer.vue |  10 +-
 src/components/Sing/ToolBar.vue        |   2 +-
 src/sing/domain.ts                     |   2 +-
 src/store/singing.ts                   | 303 ++++++++++---------------
 src/store/type.ts                      |  15 +-
 tests/unit/store/Vuex.spec.ts          |   1 +
 7 files changed, 140 insertions(+), 197 deletions(-)

diff --git a/src/components/Sing/MenuBar.vue b/src/components/Sing/MenuBar.vue
index 711b3a2e2c..b8e8cbb500 100644
--- a/src/components/Sing/MenuBar.vue
+++ b/src/components/Sing/MenuBar.vue
@@ -21,7 +21,7 @@ import { defineComponent, ref, computed, ComputedRef } from "vue";
 import { useStore } from "@/store";
 import MenuButton from "@/components/MenuButton.vue";
 import MinMaxCloseButtons from "@/components/MinMaxCloseButtons.vue";
-import { HotkeyAction, HotkeyReturnType } from "@/type/preload";
+import { HotkeyActionType, HotkeyReturnType } from "@/type/preload";
 import { setHotkeyFunctions } from "@/store/setting";
 
 type SingMenuItemBase<T extends string> = {
@@ -216,7 +216,7 @@ export default defineComponent({
       }
     };
 
-    const hotkeyMap = new Map<HotkeyAction, () => HotkeyReturnType>([
+    const hotkeyMap = new Map<HotkeyActionType, () => HotkeyReturnType>([
       // NOTE: 初期設定なし
       // ["新規", createNewSingProject],
     ]);
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 3d49e959f5..1ec1dea9f8 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -638,7 +638,7 @@ export default defineComponent({
     };
 
     const onNoteBarMouseDown = (event: MouseEvent, note: Note) => {
-      if (!isSelfEventTarget) {
+      if (!isSelfEventTarget(event)) {
         return;
       }
       if (event.button === 0) {
@@ -650,7 +650,7 @@ export default defineComponent({
     };
 
     const onNoteLeftEdgeMouseDown = (event: MouseEvent, note: Note) => {
-      if (!isSelfEventTarget) {
+      if (!isSelfEventTarget(event)) {
         return;
       }
       if (event.button === 0) {
@@ -662,7 +662,7 @@ export default defineComponent({
     };
 
     const onNoteRightEdgeMouseDown = (event: MouseEvent, note: Note) => {
-      if (!isSelfEventTarget) {
+      if (!isSelfEventTarget(event)) {
         return;
       }
       if (event.button === 0) {
@@ -674,7 +674,7 @@ export default defineComponent({
     };
 
     const onNoteLyricMouseDown = (event: MouseEvent, note: Note) => {
-      if (!isSelfEventTarget) {
+      if (!isSelfEventTarget(event)) {
         return;
       }
       if (!state.selectedNoteIds.has(note.id)) {
@@ -686,7 +686,7 @@ export default defineComponent({
     };
 
     const onMouseDown = (event: MouseEvent) => {
-      if (!isSelfEventTarget) {
+      if (!isSelfEventTarget(event)) {
         return;
       }
       if (event.button === 0) {
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index b69f3e786c..6be99185f8 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -142,7 +142,7 @@ export default defineComponent({
 
     const setBpmInputBuffer = (bpmStr: string | number | null) => {
       const bpm = Number(bpmStr);
-      if (!Number.isFinite(bpm) || bpm <= 0) {
+      if (!Number.isFinite(bpm) || bpm < 40) {
         return;
       }
       bpmInputBuffer.value = bpm;
diff --git a/src/sing/domain.ts b/src/sing/domain.ts
index 25d098c472..26269ebaaf 100644
--- a/src/sing/domain.ts
+++ b/src/sing/domain.ts
@@ -15,7 +15,7 @@ export const isValidTempo = (tempo: Tempo) => {
     Number.isInteger(tempo.position) &&
     Number.isFinite(tempo.bpm) &&
     tempo.position >= 0 &&
-    tempo.bpm > 0
+    tempo.bpm >= 40
   );
 };
 
diff --git a/src/store/singing.ts b/src/store/singing.ts
index cf22ac3b60..27b63622b0 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -15,7 +15,7 @@ import {
   Phrase,
   PhraseState,
 } from "./type";
-import { AudioQuery, Mora } from "@/openapi";
+import { FrameAudioQuery, Note as NoteForRequestToEngine } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
 import {
   AudioEvent,
@@ -38,7 +38,6 @@ import {
   isValidScore,
   isValidTempo,
   isValidTimeSignature,
-  noteNumberToFrequency,
   secondToTick,
   tickToSecond,
 } from "@/sing/domain";
@@ -60,6 +59,7 @@ import {
   createPromiseThatResolvesWhen,
   round,
 } from "@/sing/utility";
+import { EngineId } from "@/type/preload";
 
 const generateAudioEvents = async (
   audioContext: BaseAudioContext,
@@ -555,12 +555,15 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  SET_AUDIO_QUERY_TO_PHRASE: {
+  SET_FRAME_AUDIO_QUERY_TO_PHRASE: {
     mutation(
       state,
-      { phraseKey, audioQuery }: { phraseKey: string; audioQuery: AudioQuery }
+      {
+        phraseKey,
+        frameAudioQuery,
+      }: { phraseKey: string; frameAudioQuery: FrameAudioQuery }
     ) {
-      state.phrases[phraseKey].query = audioQuery;
+      state.phrases[phraseKey].query = frameAudioQuery;
     },
   },
 
@@ -767,23 +770,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
-  UPDATE_PERIODIC_PITCH: {
-    async action({ dispatch }, { audioQuery, engineId, styleId }) {
-      try {
-        const instance = await dispatch("INSTANTIATE_ENGINE_CONNECTOR", {
-          engineId,
-        });
-        return await instance.invoke("periodicPitchPeriodicPitchPost")({
-          audioQuery,
-          speaker: styleId,
-        });
-      } catch (error) {
-        window.electron.logError(error, `Failed to update periodic pitch.`);
-        throw error;
-      }
-    },
-  },
-
   SET_START_RENDERING_REQUESTED: {
     mutation(state, { startRenderingRequested }) {
       state.startRenderingRequested = startRenderingRequested;
@@ -862,156 +848,119 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         });
       };
 
-      const fetchQuery = async (singer: Singer, score: Score) => {
-        if (!getters.IS_ENGINE_READY(singer.engineId)) {
+      const fetchQuery = async (
+        engineId: EngineId,
+        score: Score,
+        frameRate: number,
+        restDurationSeconds: number
+      ) => {
+        if (!getters.IS_ENGINE_READY(engineId)) {
           throw new Error("Engine not ready.");
         }
 
-        // TODO: 助詞や拗音の扱いはあとで考える
-        const text = score.notes
-          .map((value) => value.lyric)
-          .map((value) => value.replace("じょ", "ジョ"))
-          .map((value) => value.replace("うぉ", "ウォ"))
-          .map((value) => value.replace("は", "ハ"))
-          .map((value) => value.replace("へ", "ヘ"))
-          .join("");
-
-        const query = await dispatch("FETCH_AUDIO_QUERY", {
-          text,
-          engineId: singer.engineId,
-          styleId: singer.styleId,
-        });
-        return query;
-      };
-
-      const getMoras = (query: AudioQuery) => {
-        return query.accentPhrases.map((value) => value.moras).flat();
-      };
-
-      const logPhonemes = (moras: Mora[]) => {
-        const phonemes = moras
-          .map((value) => {
-            if (value.consonant == undefined) {
-              return [value.vowel];
-            } else {
-              return [value.consonant, value.vowel];
-            }
-          })
-          .flat()
-          .join(" ");
-        window.electron.logInfo(`  phonemes: ${phonemes}`);
-      };
-
-      const editQuery = (score: Score, query: AudioQuery) => {
-        let noteIndex = 0;
-        for (let i = 0; i < query.accentPhrases.length; i++) {
-          const accentPhrase = query.accentPhrases[i];
-          const moras = accentPhrase.moras;
-          for (let j = 0; j < moras.length; j++) {
-            const mora = moras[j];
-            const note = score.notes[noteIndex];
-
-            const noteOnTime = tickToSecond(
-              note.position,
-              score.tempos,
-              score.tpqn
-            );
-            const noteOffTime = tickToSecond(
-              note.position + note.duration,
-              score.tempos,
-              score.tpqn
-            );
-
-            // 長さを編集
-            let nextMora: Mora | undefined;
-            if (j !== moras.length - 1) {
-              nextMora = moras[j + 1];
-            } else if (i !== query.accentPhrases.length - 1) {
-              const nextAccentPhrase = query.accentPhrases[i + 1];
-              nextMora = nextAccentPhrase.moras[0];
-            }
-            const minVowelLength = 0.01;
-            const minConsonantLength = 0.02;
-            const noteLength = noteOffTime - noteOnTime;
-            if (nextMora && nextMora.consonantLength != undefined) {
-              // 母音の後ろに子音がある場合
-              mora.vowelLength = noteLength - nextMora.consonantLength;
-              if (mora.vowelLength < minVowelLength) {
-                // 母音をこれ以上短くできない場合は、子音を短くする
-                mora.vowelLength = minVowelLength;
-                nextMora.consonantLength = noteLength - mora.vowelLength;
-                if (nextMora.consonantLength < minConsonantLength) {
-                  // 子音も短くできない場合は、比で母音と子音の長さを決定する
-                  const minMoraLength = minVowelLength + minConsonantLength;
-                  const vowelRatio = minVowelLength / minMoraLength;
-                  const consonantRatio = minConsonantLength / minMoraLength;
-                  mora.vowelLength = noteLength * vowelRatio;
-                  nextMora.consonantLength = noteLength * consonantRatio;
-                }
-              }
-            } else {
-              // 母音の後ろに子音がない場合
-              mora.vowelLength = noteLength;
-            }
-
-            // 音高を編集
-            const freq = noteNumberToFrequency(note.noteNumber);
-            mora.pitch = Math.log(freq);
-
-            // 無声化を解除
-            if (mora.vowel === "I") {
-              mora.vowel = "i";
-            }
-            if (mora.vowel === "U") {
-              mora.vowel = "u";
-            }
+        const restFrameLength = Math.round(restDurationSeconds * frameRate);
 
-            noteIndex++;
-          }
+        const notes: NoteForRequestToEngine[] = [];
+        // 先頭に休符を追加
+        notes.push({
+          key: undefined,
+          frameLength: restFrameLength,
+          lyric: "",
+        });
+        // ノートを変換
+        const firstNoteOnTime = tickToSecond(
+          score.notes[0].position,
+          score.tempos,
+          score.tpqn
+        );
+        let frame = 0;
+        for (const note of score.notes) {
+          const noteOffTime = tickToSecond(
+            note.position + note.duration,
+            score.tempos,
+            score.tpqn
+          );
+          const noteOffFrame = Math.round(
+            (noteOffTime - firstNoteOnTime) * frameRate
+          );
+          const noteFrameLength = Math.max(1, noteOffFrame - frame);
+          // TODO: 助詞や拗音の扱いはあとで考える
+          const lyric = note.lyric
+            .replace("じょ", "ジョ")
+            .replace("うぉ", "ウォ")
+            .replace("は", "ハ")
+            .replace("へ", "ヘ");
+          notes.push({
+            key: note.noteNumber,
+            frameLength: noteFrameLength,
+            lyric,
+          });
+          frame += noteFrameLength;
         }
-      };
+        // 末尾に休符を追加
+        notes.push({
+          key: undefined,
+          frameLength: restFrameLength,
+          lyric: "",
+        });
 
-      const updatePeriodicPitch = async (singer: Singer, query: AudioQuery) => {
-        if (!getters.IS_ENGINE_READY(singer.engineId)) {
-          throw new Error("Engine not ready.");
+        try {
+          const instance = await dispatch("INSTANTIATE_ENGINE_CONNECTOR", {
+            engineId,
+          });
+          return await instance.invoke(
+            "singFrameAudioQuerySingFrameAudioQueryPost"
+          )({
+            score: { notes },
+            styleId: 999, // TODO: 設定できるようにする
+          });
+        } catch (error) {
+          const lyrics = notes.map((value) => value.lyric).join("");
+          window.electron.logError(
+            error,
+            `Failed to fetch FrameAudioQuery. Lyrics of score are "${lyrics}".`
+          );
+          throw error;
         }
+      };
 
-        const newQuery = await dispatch("UPDATE_PERIODIC_PITCH", {
-          audioQuery: query,
-          engineId: singer.engineId,
-          styleId: singer.styleId,
-        });
-        return newQuery;
+      const getPhonemes = (frameAudioQuery: FrameAudioQuery) => {
+        return frameAudioQuery.phonemes.map((value) => value.phoneme).join(" ");
       };
 
-      const calcStartTime = (score: Score, query: AudioQuery) => {
-        const firstMora = query.accentPhrases[0].moras[0];
+      const calcStartTime = (score: Score, restDurationSeconds: number) => {
         let startTime = tickToSecond(
           score.notes[0].position,
           score.tempos,
           score.tpqn
         );
-        startTime -= query.prePhonemeLength;
-        startTime -= firstMora.consonantLength ?? 0;
+        startTime -= restDurationSeconds;
         return startTime;
       };
 
-      const synthesize = async (singer: Singer, query: AudioQuery) => {
+      const synthesize = async (singer: Singer, query: FrameAudioQuery) => {
         if (!getters.IS_ENGINE_READY(singer.engineId)) {
           throw new Error("Engine not ready.");
         }
 
-        const blob = await dispatch("INSTANTIATE_ENGINE_CONNECTOR", {
-          engineId: singer.engineId,
-        }).then((instance) => {
-          return instance.invoke("synthesisSynthesisPost")({
-            audioQuery: query,
-            speaker: singer.styleId,
-            enableInterrogativeUpspeak:
-              state.experimentalSetting.enableInterrogativeUpspeak,
+        try {
+          const instance = await dispatch("INSTANTIATE_ENGINE_CONNECTOR", {
+            engineId: singer.engineId,
           });
-        });
-        return blob;
+          return await instance.invoke("frameSynthesisFrameSynthesisPost")({
+            frameAudioQuery: query,
+            styleId: singer.styleId,
+          });
+        } catch (error) {
+          const phonemes = query.phonemes
+            .map((value) => value.phoneme)
+            .join(" ");
+          window.electron.logError(
+            error,
+            `Failed to synthesis. Phonemes are "${phonemes}".`
+          );
+          throw error;
+        }
       };
 
       // NOTE: 型推論でawaitの前か後かが考慮されないので、関数を介して取得する（型がbooleanになるようにする）
@@ -1036,8 +985,6 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         // Score -> Phrases
 
-        window.electron.logInfo("Updating phrases...");
-
         const foundPhrases = await searchPhrases(singer, score);
         for (const [hash, phrase] of foundPhrases) {
           const key = hash;
@@ -1089,14 +1036,15 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           return;
         }
 
-        for (const [key, phrase] of getSortedPhrasesEntries(state.phrases)) {
+        const sortedPhrasesEntries = getSortedPhrasesEntries(state.phrases);
+        for (const [phraseKey, phrase] of sortedPhrasesEntries) {
           if (!phrase.singer) {
             continue;
           }
 
           if (phrase.state === "WAITING_TO_BE_RENDERED") {
             commit("SET_STATE_TO_PHRASE", {
-              phraseKey: key,
+              phraseKey,
               phraseState: "NOW_RENDERING",
             });
           }
@@ -1105,32 +1053,35 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           // Score & AudioQuery -> StartTime
 
           if (!phrase.query) {
-            window.electron.logInfo(`Generating query...`);
+            const engineId = phrase.singer.engineId;
+            const frameRate = state.engineManifests[engineId].frameRate;
+            const restDurationSeconds = 1; // 仮置き
+
+            const frameAudioQuery = await fetchQuery(
+              phrase.singer.engineId,
+              phrase.score,
+              frameRate,
+              restDurationSeconds
+            );
+            const phonemes = getPhonemes(frameAudioQuery);
 
-            let audioQuery = await fetchQuery(phrase.singer, phrase.score);
-            const moras = getMoras(audioQuery);
-            logPhonemes(moras);
-            if (moras.length !== phrase.score.notes.length) {
-              commit("SET_STATE_TO_PHRASE", {
-                phraseKey: key,
-                phraseState: "COULD_NOT_RENDER",
-              });
-              continue;
-            }
-            editQuery(phrase.score, audioQuery);
-            audioQuery = await updatePeriodicPitch(phrase.singer, audioQuery);
-            const startTime = calcStartTime(phrase.score, audioQuery);
+            window.electron.logInfo(
+              `Fetched frame audio query. Phonemes are "${phonemes}".`
+            );
 
-            commit("SET_AUDIO_QUERY_TO_PHRASE", { phraseKey: key, audioQuery });
-            commit("SET_START_TIME_TO_PHRASE", { phraseKey: key, startTime });
+            const startTime = calcStartTime(phrase.score, restDurationSeconds);
 
-            window.electron.logInfo(`Query generated.`);
+            commit("SET_FRAME_AUDIO_QUERY_TO_PHRASE", {
+              phraseKey,
+              frameAudioQuery,
+            });
+            commit("SET_START_TIME_TO_PHRASE", { phraseKey, startTime });
           }
 
           if (startRenderingRequested() || stopRenderingRequested()) {
             if (phrase.state === "NOW_RENDERING") {
               commit("SET_STATE_TO_PHRASE", {
-                phraseKey: key,
+                phraseKey,
                 phraseState: "WAITING_TO_BE_RENDERED",
               });
             }
@@ -1140,7 +1091,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           // AudioQuery -> Blob
           // Blob & StartTime -> AudioSequence
 
-          const phraseData = phraseDataMap.get(key);
+          const phraseData = phraseDataMap.get(phraseKey);
           if (!phraseData) {
             throw new Error("phraseData is undefined");
           }
@@ -1151,14 +1102,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             throw new Error("startTime is undefined.");
           }
           if (!phraseData.blob) {
-            phraseData.blob = phraseAudioBlobCache.get(key);
+            phraseData.blob = phraseAudioBlobCache.get(phraseKey);
             if (phraseData.blob) {
               window.electron.logInfo(`Loaded audio buffer from cache.`);
             } else {
-              window.electron.logInfo(`Synthesizing...`);
-
               phraseData.blob = await synthesize(phrase.singer, phrase.query);
-              phraseAudioBlobCache.set(key, phraseData.blob);
+              phraseAudioBlobCache.set(phraseKey, phraseData.blob);
 
               window.electron.logInfo(`Synthesized.`);
             }
@@ -1189,7 +1138,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
           if (phrase.state === "NOW_RENDERING") {
             commit("SET_STATE_TO_PHRASE", {
-              phraseKey: key,
+              phraseKey,
               phraseState: "PLAYABLE",
             });
           }
diff --git a/src/store/type.ts b/src/store/type.ts
index b88e0ae119..a0767525db 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -15,6 +15,7 @@ import {
   SupportedDevicesInfo,
   UserDictWord,
   MorphableTargetInfo,
+  FrameAudioQuery,
 } from "@/openapi";
 import {
   CharacterInfo,
@@ -758,7 +759,7 @@ export type Phrase = {
   startTicks: number;
   endTicks: number;
   state: PhraseState;
-  query?: AudioQuery;
+  query?: FrameAudioQuery;
   startTime?: number;
 };
 
@@ -868,8 +869,8 @@ export type SingingStoreTypes = {
     mutation: { phraseKey: string; phraseState: PhraseState };
   };
 
-  SET_AUDIO_QUERY_TO_PHRASE: {
-    mutation: { phraseKey: string; audioQuery: AudioQuery };
+  SET_FRAME_AUDIO_QUERY_TO_PHRASE: {
+    mutation: { phraseKey: string; frameAudioQuery: FrameAudioQuery };
   };
 
   SET_START_TIME_TO_PHRASE: {
@@ -971,14 +972,6 @@ export type SingingStoreTypes = {
     action(payload: { noteNumber: number }): void;
   };
 
-  UPDATE_PERIODIC_PITCH: {
-    action(payload: {
-      audioQuery: AudioQuery;
-      engineId: EngineId;
-      styleId: StyleId;
-    }): Promise<AudioQuery>;
-  };
-
   SET_START_RENDERING_REQUESTED: {
     mutation: { startRenderingRequested: boolean };
   };
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index a433469422..a61d6aec61 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -124,6 +124,7 @@ describe("store/vuex.js test", () => {
               interrogativeUpspeak: true,
               synthesisMorphing: true,
             },
+            frameRate: 93.75,
           },
         },
         experimentalSetting: {

From 0f160332bc90739a35e28af320016101b7fa6ae5 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 22 Jan 2024 04:08:31 +0900
Subject: [PATCH 49/59] =?UTF-8?q?[project-s]=20=E3=83=AA=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0=20(#1735)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* リファクタリング

* シンセの音量を変更

* リファクタリングとコメントの追加

* undefined判定を修正
---
 src/components/Sing/CharacterMenuButton.vue   |   6 +-
 src/components/Sing/ScoreSequencer.vue        | 110 +++++++++---------
 src/components/Sing/SequencerKeys.vue         |   4 +-
 .../Sing/SequencerPhraseIndicator.vue         |   5 +-
 src/components/Sing/ToolBar.vue               |  15 ++-
 src/infrastructures/AudioRenderer.ts          |  10 +-
 src/sing/domain.ts                            |  70 ++++++-----
 src/sing/storeHelper.ts                       |  17 +--
 src/store/singing.ts                          |  96 ++++++++-------
 src/store/type.ts                             |   7 +-
 tests/unit/store/Vuex.spec.ts                 |   2 +-
 11 files changed, 191 insertions(+), 151 deletions(-)

diff --git a/src/components/Sing/CharacterMenuButton.vue b/src/components/Sing/CharacterMenuButton.vue
index 8ac6f97755..9e7cda25b0 100644
--- a/src/components/Sing/CharacterMenuButton.vue
+++ b/src/components/Sing/CharacterMenuButton.vue
@@ -180,7 +180,7 @@ export default defineComponent({
             )
         )
       );
-      if (engineId === undefined)
+      if (engineId == undefined)
         throw new Error(
           `No engineId for target character style (speakerUuid == ${speakerUuid}, styleId == ${styleId})`
         );
@@ -209,8 +209,8 @@ export default defineComponent({
 
     const selectedCharacterInfo = computed(() => {
       if (
-        userOrderedCharacterInfos.value === undefined ||
-        store.state.singer === undefined
+        userOrderedCharacterInfos.value == undefined ||
+        store.state.singer == undefined
       )
         return undefined;
       return store.getters.CHARACTER_INFO(
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 1ec1dea9f8..73a68ff000 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -101,6 +101,7 @@
           transform: `translateX(${guideLineX}px)`,
         }"
       ></div>
+      <!-- TODO: 1つのv-forで全てのノートを描画できるようにする -->
       <sequencer-note
         v-for="note in unselectedNotes"
         :key="note.id"
@@ -230,12 +231,20 @@ export default defineComponent({
     const state = store.state;
     // 分解能（Ticks Per Quarter Note）
     const tpqn = computed(() => state.score.tpqn);
-    // ノート
-    const notes = computed(() => state.score.notes);
     // テンポ
     const tempos = computed(() => state.score.tempos);
     // 拍子
     const timeSignatures = computed(() => state.score.timeSignatures);
+    // ノート
+    const notes = computed(() => state.score.notes);
+    const unselectedNotes = computed(() => {
+      const selectedNoteIds = state.selectedNoteIds;
+      return notes.value.filter((value) => !selectedNoteIds.has(value.id));
+    });
+    const selectedNotes = computed(() => {
+      const selectedNoteIds = state.selectedNoteIds;
+      return notes.value.filter((value) => selectedNoteIds.has(value.id));
+    });
     // ズーム状態
     const zoomX = computed(() => state.sequencerZoomX);
     const zoomY = computed(() => state.sequencerZoomY);
@@ -245,11 +254,8 @@ export default defineComponent({
     });
     // シーケンサグリッド
     const gridCellTicks = snapTicks; // ひとまずスナップ幅＝グリッドセル幅
-    const gridCellBaseWidth = computed(() => {
-      return tickToBaseX(gridCellTicks.value, tpqn.value);
-    });
     const gridCellWidth = computed(() => {
-      return gridCellBaseWidth.value * zoomX.value;
+      return tickToBaseX(gridCellTicks.value, tpqn.value) * zoomX.value;
     });
     const gridCellBaseHeight = getKeyBaseHeight();
     const gridCellHeight = computed(() => {
@@ -299,16 +305,9 @@ export default defineComponent({
       const baseX = tickToBaseX(playheadTicks.value, tpqn.value);
       return Math.floor(baseX * zoomX.value);
     });
-    const unselectedNotes = computed(() => {
-      const selectedNoteIds = state.selectedNoteIds;
-      return notes.value.filter((value) => !selectedNoteIds.has(value.id));
-    });
-    const selectedNotes = computed(() => {
-      const selectedNoteIds = state.selectedNoteIds;
-      return notes.value.filter((value) => selectedNoteIds.has(value.id));
-    });
+    // フレーズ
     const phraseInfos = computed(() => {
-      return Object.entries(state.phrases).map(([key, phrase]) => {
+      return [...state.phrases.entries()].map(([key, phrase]) => {
         const startBaseX = tickToBaseX(phrase.startTicks, tpqn.value);
         const endBaseX = tickToBaseX(phrase.endTicks, tpqn.value);
         const startX = startBaseX * zoomX.value;
@@ -330,6 +329,7 @@ export default defineComponent({
     let previewRequestId = 0;
     let dragStartTicks = 0;
     let dragStartNoteNumber = 0;
+    let dragStartGuideLineTicks = 0;
     let draggingNoteId = ""; // FIXME: 無効状態はstring以外の型にする
     let edited = false; // プレビュー終了時にScoreの変更を行うかどうかを表す変数
     // ダブルクリック
@@ -339,7 +339,7 @@ export default defineComponent({
       undefined,
     ];
     let ignoreDoubleClick = false;
-    // ガイドライン
+    // 入力を補助する線
     const showGuideLine = ref(true);
     const guideLineX = ref(0);
 
@@ -422,11 +422,10 @@ export default defineComponent({
         edited = true;
       }
 
-      // 当たり判定を0.25だけずらす
-      const guidelineTicks =
-        Math.round(dragStartTicks / snapTicks.value - 0.25) * snapTicks.value +
-        movingTicks;
-      const guideLineBaseX = tickToBaseX(guidelineTicks, tpqn.value);
+      const guideLineBaseX = tickToBaseX(
+        dragStartGuideLineTicks + movingTicks,
+        tpqn.value
+      );
       guideLineX.value = guideLineBaseX * zoomX.value;
     };
 
@@ -557,8 +556,7 @@ export default defineComponent({
       note?: Note
     ) => {
       if (nowPreviewing.value) {
-        // RESIZE_RIGHT・RESIZE_LEFTのあとにADDも発生するので、その場合は無視する
-        // TODO: stopPropagation付けたり、他のイベントではエラーを投げるようにする
+        store.dispatch("LOG_WARN", "startPreview was called during preview.");
         return;
       }
       const sequencerBodyElement = sequencerBody.value;
@@ -577,6 +575,9 @@ export default defineComponent({
       const cursorBaseY = (scrollY.value + cursorY) / zoomY.value;
       const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
       const cursorNoteNumber = baseYToNoteNumber(cursorBaseY);
+      // NOTE: 入力を補助する線の判定の境目はスナップ幅の3/4の位置
+      const guideLineTicks =
+        Math.round(cursorTicks / snapTicks.value - 0.25) * snapTicks.value;
       const copiedNotes: Note[] = [];
       if (mode === "ADD") {
         if (cursorNoteNumber < 0) {
@@ -584,8 +585,7 @@ export default defineComponent({
         }
         note = {
           id: uuidv4(),
-          position:
-            Math.round(cursorTicks / snapTicks.value - 0.25) * snapTicks.value,
+          position: guideLineTicks,
           duration: snapTicks.value,
           noteNumber: cursorNoteNumber,
           lyric: getDoremiFromNoteNumber(cursorNoteNumber),
@@ -626,6 +626,7 @@ export default defineComponent({
       previewMode = mode;
       dragStartTicks = cursorTicks;
       dragStartNoteNumber = cursorNoteNumber;
+      dragStartGuideLineTicks = guideLineTicks;
       draggingNoteId = note.id;
       edited = mode === "ADD";
       copiedNotesForPreview.clear();
@@ -709,6 +710,7 @@ export default defineComponent({
         const scrollLeft = sequencerBodyElement.scrollLeft;
         const cursorBaseX = (scrollLeft + cursorX) / zoomX.value;
         const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
+        // NOTE: 入力を補助する線の判定の境目はスナップ幅の3/4の位置
         const guideLineTicks =
           Math.round(cursorTicks / snapTicks.value - 0.25) * snapTicks.value;
         const guideLineBaseX = tickToBaseX(guideLineTicks, tpqn.value);
@@ -1097,6 +1099,35 @@ export default defineComponent({
   position: relative;
 }
 
+.sequencer-grid {
+  display: block;
+  pointer-events: none;
+}
+
+.sequencer-grid-cell {
+  display: block;
+  stroke: #e8e8e8;
+  stroke-width: 1;
+}
+
+.sequencer-grid-cell-white {
+  fill: #fff;
+}
+
+.sequencer-grid-cell-black {
+  fill: #f2f2f2;
+}
+
+.sequencer-grid-measure-line {
+  backface-visibility: hidden;
+  stroke: #b0b0b0;
+}
+
+.sequencer-grid-beat-line {
+  backface-visibility: hidden;
+  stroke: #d0d0d0;
+}
+
 .sequencer-guideline {
   position: absolute;
   top: 0;
@@ -1132,33 +1163,4 @@ export default defineComponent({
   border-left: 1px solid rgba(colors.$background-rgb, 0.83);
   border-right: 1px solid rgba(colors.$background-rgb, 0.83);
 }
-
-.sequencer-grid {
-  display: block;
-  pointer-events: none;
-}
-
-.sequencer-grid-cell {
-  display: block;
-  stroke: #e8e8e8;
-  stroke-width: 1;
-}
-
-.sequencer-grid-cell-white {
-  fill: #fff;
-}
-
-.sequencer-grid-cell-black {
-  fill: #f2f2f2;
-}
-
-.sequencer-grid-measure-line {
-  backface-visibility: hidden;
-  stroke: #b0b0b0;
-}
-
-.sequencer-grid-beat-line {
-  backface-visibility: hidden;
-  stroke: #d0d0d0;
-}
 </style>
diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue
index e4bdfeeb17..165001e1c5 100644
--- a/src/components/Sing/SequencerKeys.vue
+++ b/src/components/Sing/SequencerKeys.vue
@@ -121,7 +121,7 @@ export default defineComponent({
     };
 
     const onMouseUp = () => {
-      if (noteNumberOfKeyBeingPressed.value !== undefined) {
+      if (noteNumberOfKeyBeingPressed.value != undefined) {
         const noteNumber = noteNumberOfKeyBeingPressed.value;
         noteNumberOfKeyBeingPressed.value = undefined;
         store.dispatch("STOP_PREVIEW_SOUND", { noteNumber });
@@ -130,7 +130,7 @@ export default defineComponent({
 
     const onMouseEnter = (noteNumber: number) => {
       if (
-        noteNumberOfKeyBeingPressed.value !== undefined &&
+        noteNumberOfKeyBeingPressed.value != undefined &&
         noteNumberOfKeyBeingPressed.value !== noteNumber
       ) {
         store.dispatch("STOP_PREVIEW_SOUND", {
diff --git a/src/components/Sing/SequencerPhraseIndicator.vue b/src/components/Sing/SequencerPhraseIndicator.vue
index 9fb3fe290f..19b760f213 100644
--- a/src/components/Sing/SequencerPhraseIndicator.vue
+++ b/src/components/Sing/SequencerPhraseIndicator.vue
@@ -21,7 +21,10 @@ export default defineComponent({
       PLAYABLE: "playable",
     };
     const className = computed(() => {
-      const phrase = store.state.phrases[props.phraseKey];
+      const phrase = store.state.phrases.get(props.phraseKey);
+      if (phrase == undefined) {
+        throw new Error("phrase is undefined.");
+      }
       return classNames[phrase.state];
     });
 
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 6be99185f8..6b20e1ce89 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -99,8 +99,13 @@ import {
   onUnmounted,
 } from "vue";
 import { useStore } from "@/store";
-import { isTriplet, isValidBeatType } from "@/sing/domain";
-import { getSnapTypes } from "@/sing/storeHelper";
+import {
+  getSnapTypes,
+  isTriplet,
+  isValidBeatType,
+  isValidBeats,
+  isValidBpm,
+} from "@/sing/domain";
 
 export default defineComponent({
   name: "SingToolBar",
@@ -142,21 +147,21 @@ export default defineComponent({
 
     const setBpmInputBuffer = (bpmStr: string | number | null) => {
       const bpm = Number(bpmStr);
-      if (!Number.isFinite(bpm) || bpm < 40) {
+      if (!isValidBpm(bpm)) {
         return;
       }
       bpmInputBuffer.value = bpm;
     };
     const setBeatsInputBuffer = (beatsStr: string | number | null) => {
       const beats = Number(beatsStr);
-      if (!Number.isInteger(beats) || beats <= 0) {
+      if (!isValidBeats(beats)) {
         return;
       }
       beatsInputBuffer.value = beats;
     };
     const setBeatTypeInputBuffer = (beatTypeStr: string | number | null) => {
       const beatType = Number(beatTypeStr);
-      if (!Number.isInteger(beatType) || !isValidBeatType(beatType)) {
+      if (!isValidBeatType(beatType)) {
         return;
       }
       beatTypeInputBuffer.value = beatType;
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index cebae8e94e..adc53bd423 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -541,7 +541,7 @@ class AudioPlayerVoice {
    * @param offset オフセット（秒）
    */
   play(contextTime: number, offset: number) {
-    if (this.stopContextTime !== undefined) {
+    if (this.stopContextTime != undefined) {
       throw new Error("Already started.");
     }
     this.audioBufferSourceNode.start(contextTime, offset);
@@ -555,7 +555,7 @@ class AudioPlayerVoice {
    * @param contextTime 停止する時刻（コンテキスト時刻）
    */
   stop(contextTime: number) {
-    if (this.stopContextTime === undefined) {
+    if (this.stopContextTime == undefined) {
       throw new Error("Not started.");
     }
     if (contextTime < this.stopContextTime) {
@@ -740,7 +740,7 @@ class SynthVoice {
     const stopContextTime = t0 + rel * 4;
 
     if (
-      this.stopContextTime === undefined ||
+      this.stopContextTime == undefined ||
       stopContextTime < this.stopContextTime
     ) {
       // リリースのスケジュールを行う
@@ -796,7 +796,7 @@ export class PolySynth implements Instrument {
     };
 
     this.gainNode = new GainNode(this.audioContext);
-    this.gainNode.gain.value = options?.volume ?? 0.12;
+    this.gainNode.gain.value = options?.volume ?? 0.11;
   }
 
   /**
@@ -833,7 +833,7 @@ export class PolySynth implements Instrument {
       });
       this.voices.push(voice);
     }
-    if (duration !== undefined) {
+    if (duration != undefined) {
       voice.noteOff(contextTime + duration);
     }
   }
diff --git a/src/sing/domain.ts b/src/sing/domain.ts
index 26269ebaaf..aa4a0f9916 100644
--- a/src/sing/domain.ts
+++ b/src/sing/domain.ts
@@ -1,6 +1,8 @@
 import { Note, Score, Tempo, TimeSignature } from "@/store/type";
 
 const BEAT_TYPES = [2, 4, 8, 16];
+const MIN_BPM = 40;
+const MAX_SNAP_TYPE = 32;
 
 export const isValidTpqn = (tpqn: number) => {
   return (
@@ -10,15 +12,22 @@ export const isValidTpqn = (tpqn: number) => {
   );
 };
 
+export const isValidBpm = (bpm: number) => {
+  return Number.isFinite(bpm) && bpm >= MIN_BPM;
+};
+
 export const isValidTempo = (tempo: Tempo) => {
   return (
     Number.isInteger(tempo.position) &&
-    Number.isFinite(tempo.bpm) &&
     tempo.position >= 0 &&
-    tempo.bpm >= 40
+    isValidBpm(tempo.bpm)
   );
 };
 
+export const isValidBeats = (beats: number) => {
+  return Number.isInteger(beats) && beats >= 1;
+};
+
 export const isValidBeatType = (beatType: number) => {
   return Number.isInteger(beatType) && BEAT_TYPES.includes(beatType);
 };
@@ -26,9 +35,8 @@ export const isValidBeatType = (beatType: number) => {
 export const isValidTimeSignature = (timeSignature: TimeSignature) => {
   return (
     Number.isInteger(timeSignature.measureNumber) &&
-    Number.isInteger(timeSignature.beats) &&
-    timeSignature.measureNumber > 0 &&
-    timeSignature.beats > 0 &&
+    timeSignature.measureNumber >= 1 &&
+    isValidBeats(timeSignature.beats) &&
     isValidBeatType(timeSignature.beatType)
   );
 };
@@ -39,7 +47,7 @@ export const isValidNote = (note: Note) => {
     Number.isInteger(note.duration) &&
     Number.isInteger(note.noteNumber) &&
     note.position >= 0 &&
-    note.duration > 0 &&
+    note.duration >= 1 &&
     note.noteNumber >= 0 &&
     note.noteNumber <= 127
   );
@@ -47,7 +55,7 @@ export const isValidNote = (note: Note) => {
 
 export const isValidTempos = (tempos: Tempo[]) => {
   return (
-    tempos.length > 0 &&
+    tempos.length >= 1 &&
     tempos[0].position === 0 &&
     tempos.every((value) => isValidTempo(value))
   );
@@ -55,7 +63,7 @@ export const isValidTempos = (tempos: Tempo[]) => {
 
 export const isValidTimeSignatures = (timeSignatures: TimeSignature[]) => {
   return (
-    timeSignatures.length > 0 &&
+    timeSignatures.length >= 1 &&
     timeSignatures[0].measureNumber === 1 &&
     timeSignatures.every((value) => isValidTimeSignature(value))
   );
@@ -74,24 +82,6 @@ export const isValidScore = (score: Score) => {
   );
 };
 
-export function noteNumberToFrequency(noteNumber: number) {
-  return 440 * Math.pow(2, (noteNumber - 69) / 12);
-}
-
-export function linearToDecibel(linearValue: number) {
-  if (linearValue === 0) {
-    return -1000;
-  }
-  return 20 * Math.log10(linearValue);
-}
-
-export function decibelToLinear(decibelValue: number) {
-  if (decibelValue <= -1000) {
-    return 0;
-  }
-  return Math.pow(10, decibelValue / 20);
-}
-
 const tickToSecondForConstantBpm = (
   ticks: number,
   bpm: number,
@@ -256,3 +246,31 @@ export function getRepresentableNoteTypes(tpqn: number) {
 export function isTriplet(noteType: number) {
   return noteType % 3 === 0;
 }
+
+export function noteNumberToFrequency(noteNumber: number) {
+  return 440 * Math.pow(2, (noteNumber - 69) / 12);
+}
+
+export function linearToDecibel(linearValue: number) {
+  if (linearValue === 0) {
+    return -1000;
+  }
+  return 20 * Math.log10(linearValue);
+}
+
+export function decibelToLinear(decibelValue: number) {
+  if (decibelValue <= -1000) {
+    return 0;
+  }
+  return Math.pow(10, decibelValue / 20);
+}
+
+export function getSnapTypes(tpqn: number) {
+  return getRepresentableNoteTypes(tpqn).filter((value) => {
+    return value <= MAX_SNAP_TYPE;
+  });
+}
+
+export function isValidSnapType(snapType: number, tpqn: number) {
+  return getSnapTypes(tpqn).some((value) => value === snapType);
+}
diff --git a/src/sing/storeHelper.ts b/src/sing/storeHelper.ts
index bc47172824..35e998b11d 100644
--- a/src/sing/storeHelper.ts
+++ b/src/sing/storeHelper.ts
@@ -1,24 +1,11 @@
 import { Note, Score, Singer } from "@/store/type";
-import { getRepresentableNoteTypes } from "@/sing/domain";
 import { generateHash } from "@/sing/utility";
 
-export const MAX_SNAP_TYPE = 32;
-
 export const DEFAULT_TPQN = 480;
 export const DEFAULT_BPM = 120;
 export const DEFAULT_BEATS = 4;
 export const DEFAULT_BEAT_TYPE = 4;
 
-export function getSnapTypes(tpqn: number) {
-  return getRepresentableNoteTypes(tpqn).filter((value) => {
-    return value <= MAX_SNAP_TYPE;
-  });
-}
-
-export function isValidSnapType(snapType: number, tpqn: number) {
-  return getSnapTypes(tpqn).some((value) => value === snapType);
-}
-
 export const copyScore = (score: Score): Score => {
   return {
     tpqn: score.tpqn,
@@ -169,4 +156,8 @@ export class OverlappingNotesDetector {
     }
     return overlappingNoteIds;
   }
+
+  clear() {
+    this.noteInfos.clear();
+  }
 }
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 27b63622b0..3733dea1f9 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -15,6 +15,7 @@ import {
   Phrase,
   PhraseState,
 } from "./type";
+import { EngineId } from "@/type/preload";
 import { FrameAudioQuery, Note as NoteForRequestToEngine } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
 import {
@@ -36,6 +37,7 @@ import {
   getMeasureDuration,
   isValidNote,
   isValidScore,
+  isValidSnapType,
   isValidTempo,
   isValidTimeSignature,
   secondToTick,
@@ -51,7 +53,6 @@ import {
   copyScore,
   copySinger,
   generateSingerAndScoreHash,
-  isValidSnapType,
 } from "@/sing/storeHelper";
 import { getDoremiFromNoteNumber } from "@/sing/viewHelper";
 import {
@@ -59,7 +60,6 @@ import {
   createPromiseThatResolvesWhen,
   round,
 } from "@/sing/utility";
-import { EngineId } from "@/type/preload";
 
 const generateAudioEvents = async (
   audioContext: BaseAudioContext,
@@ -136,12 +136,12 @@ export const singingStoreState: SingingStoreState = {
     ],
     notes: [],
   },
-  phrases: {},
+  phrases: new Map(),
   // NOTE: UIの状態は試行のためsinging.tsに局所化する+Hydrateが必要
   isShowSinger: true,
   sequencerZoomX: 0.5,
   sequencerZoomY: 0.75,
-  sequencerSnapType: 16, // スナップタイプ
+  sequencerSnapType: 16,
   selectedNoteIds: new Set(),
   overlappingNoteIds: new Set(),
   nowPlaying: false,
@@ -215,7 +215,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
   SET_SCORE: {
     mutation(state, { score }: { score: Score }) {
-      overlappingNotesDetector.removeNotes(state.score.notes);
+      overlappingNotesDetector.clear();
       state.overlappingNoteIds.clear();
       state.editingLyricNoteId = undefined;
       state.selectedNoteIds.clear();
@@ -384,6 +384,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
     },
   },
 
+  NOTE_IDS: {
+    getter(state) {
+      const noteIds = state.score.notes.map((value) => value.id);
+      return new Set(noteIds);
+    },
+  },
+
   ADD_NOTES: {
     mutation(state, { notes }: { notes: Note[] }) {
       const scoreNotes = [...state.score.notes, ...notes];
@@ -393,11 +400,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.overlappingNoteIds =
         overlappingNotesDetector.getOverlappingNoteIds();
     },
-    async action({ state, commit, dispatch }, { notes }: { notes: Note[] }) {
-      const scoreNotes = state.score.notes;
-      const existingIds = new Set(scoreNotes.map((value) => value.id));
+    async action({ getters, commit, dispatch }, { notes }: { notes: Note[] }) {
+      const existingNoteIds = getters.NOTE_IDS;
       const isValidNotes = notes.every((value) => {
-        return !existingIds.has(value.id) && isValidNote(value);
+        return !existingNoteIds.has(value.id) && isValidNote(value);
       });
       if (!isValidNotes) {
         throw new Error("The notes are invalid.");
@@ -423,11 +429,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state.overlappingNoteIds =
         overlappingNotesDetector.getOverlappingNoteIds();
     },
-    async action({ state, commit, dispatch }, { notes }: { notes: Note[] }) {
-      const scoreNotes = state.score.notes;
-      const existingIds = new Set(scoreNotes.map((value) => value.id));
+    async action({ getters, commit, dispatch }, { notes }: { notes: Note[] }) {
+      const existingNoteIds = getters.NOTE_IDS;
       const isValidNotes = notes.every((value) => {
-        return existingIds.has(value.id) && isValidNote(value);
+        return existingNoteIds.has(value.id) && isValidNote(value);
       });
       if (!isValidNotes) {
         throw new Error("The notes are invalid.");
@@ -461,12 +466,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       });
     },
     async action(
-      { state, commit, dispatch },
+      { getters, commit, dispatch },
       { noteIds }: { noteIds: string[] }
     ) {
-      const scoreNotes = state.score.notes;
-      const existingIds = new Set(scoreNotes.map((value) => value.id));
-      const isValidNoteIds = noteIds.every((value) => existingIds.has(value));
+      const existingNoteIds = getters.NOTE_IDS;
+      const isValidNoteIds = noteIds.every((value) => {
+        return existingNoteIds.has(value);
+      });
       if (!isValidNoteIds) {
         throw new Error("The note ids are invalid.");
       }
@@ -482,10 +488,12 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         state.selectedNoteIds.add(noteId);
       }
     },
-    async action({ state, commit }, { noteIds }: { noteIds: string[] }) {
-      const scoreNotes = state.score.notes;
-      const existingIds = new Set(scoreNotes.map((value) => value.id));
-      if (!noteIds.every((value) => existingIds.has(value))) {
+    async action({ getters, commit }, { noteIds }: { noteIds: string[] }) {
+      const existingNoteIds = getters.NOTE_IDS;
+      const isValidNoteIds = noteIds.every((value) => {
+        return existingNoteIds.has(value);
+      });
+      if (!isValidNoteIds) {
         throw new Error("The note ids are invalid.");
       }
       commit("SELECT_NOTES", { noteIds });
@@ -518,10 +526,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       }
       state.editingLyricNoteId = noteId;
     },
-    async action({ state, commit }, { noteId }: { noteId?: string }) {
-      const scoreNotes = state.score.notes;
-      const existingIds = new Set(scoreNotes.map((value) => value.id));
-      if (noteId != undefined && !existingIds.has(noteId)) {
+    async action({ getters, commit }, { noteId }: { noteId?: string }) {
+      if (noteId != undefined && !getters.NOTE_IDS.has(noteId)) {
         throw new Error("The note id is invalid.");
       }
       commit("SET_EDITING_LYRIC_NOTE_ID", { noteId });
@@ -533,13 +539,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state,
       { phraseKey, phrase }: { phraseKey: string; phrase: Phrase }
     ) {
-      state.phrases[phraseKey] = phrase;
+      state.phrases.set(phraseKey, phrase);
     },
   },
 
   DELETE_PHRASE: {
     mutation(state, { phraseKey }: { phraseKey: string }) {
-      delete state.phrases[phraseKey];
+      state.phrases.delete(phraseKey);
     },
   },
 
@@ -551,7 +557,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         phraseState,
       }: { phraseKey: string; phraseState: PhraseState }
     ) {
-      state.phrases[phraseKey].state = phraseState;
+      const phrase = state.phrases.get(phraseKey);
+      if (phrase == undefined) {
+        throw new Error("phrase is undefined.");
+      }
+      phrase.state = phraseState;
     },
   },
 
@@ -563,7 +573,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         frameAudioQuery,
       }: { phraseKey: string; frameAudioQuery: FrameAudioQuery }
     ) {
-      state.phrases[phraseKey].query = frameAudioQuery;
+      const phrase = state.phrases.get(phraseKey);
+      if (phrase == undefined) {
+        throw new Error("phrase is undefined.");
+      }
+      phrase.query = frameAudioQuery;
     },
   },
 
@@ -572,7 +586,11 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
       state,
       { phraseKey, startTime }: { phraseKey: string; startTime: number }
     ) {
-      state.phrases[phraseKey].startTime = startTime;
+      const phrase = state.phrases.get(phraseKey);
+      if (phrase == undefined) {
+        throw new Error("phrase is undefined.");
+      }
+      phrase.startTime = startTime;
     },
   },
 
@@ -842,8 +860,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         return foundPhrases;
       };
 
-      const getSortedPhrasesEntries = (phrases: Record<string, Phrase>) => {
-        return Object.entries(phrases).sort((a, b) => {
+      const getSortedPhrasesEntries = (phrases: Map<string, Phrase>) => {
+        return [...phrases.entries()].sort((a, b) => {
           return a[1].startTicks - b[1].startTicks;
         });
       };
@@ -987,9 +1005,9 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
 
         const foundPhrases = await searchPhrases(singer, score);
         for (const [hash, phrase] of foundPhrases) {
-          const key = hash;
-          if (!Object.hasOwn(state.phrases, key)) {
-            commit("SET_PHRASE", { phraseKey: key, phrase });
+          const phraseKey = hash;
+          if (!state.phrases.has(phraseKey)) {
+            commit("SET_PHRASE", { phraseKey, phrase });
 
             // フレーズ追加時の処理
             const noteEvents = generateNoteEvents(
@@ -1005,13 +1023,13 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
               noteEvents,
             };
             transportRef.addSequence(noteSequence);
-            phraseDataMap.set(key, {
+            phraseDataMap.set(phraseKey, {
               source: polySynth,
               sequence: noteSequence,
             });
           }
         }
-        for (const key of Object.keys(state.phrases)) {
+        for (const key of state.phrases.keys()) {
           if (!foundPhrases.has(key)) {
             commit("DELETE_PHRASE", { phraseKey: key });
 
@@ -1842,8 +1860,8 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             : undefined;
           const clipper = new Clipper(offlineAudioContext);
 
-          for (const [key, phrase] of Object.entries(state.phrases)) {
-            const phraseData = phraseDataMap.get(key);
+          for (const [phraseKey, phrase] of state.phrases) {
+            const phraseData = phraseDataMap.get(phraseKey);
             if (!phraseData) {
               throw new Error("phraseData is undefined");
             }
diff --git a/src/store/type.ts b/src/store/type.ts
index a0767525db..1a234a5be2 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -766,10 +766,9 @@ export type Phrase = {
 export type SingingStoreState = {
   singer?: Singer;
   score: Score;
-  phrases: Record<string, Phrase>;
+  phrases: Map<string, Phrase>;
   // NOTE: UIの状態などは分割・統合した方がよさそうだが、ボイス側と混在させないためいったん局所化する
   isShowSinger: boolean;
-  // NOTE: オーディオ再生はボイスと同様もしくは拡張して使う？
   sequencerZoomX: number;
   sequencerZoomY: number;
   sequencerSnapType: number;
@@ -823,6 +822,10 @@ export type SingingStoreTypes = {
     action(payload: { measureNumber: number }): void;
   };
 
+  NOTE_IDS: {
+    getter: Set<string>;
+  };
+
   ADD_NOTES: {
     mutation: { notes: Note[] };
     action(payload: { notes: Note[] }): void;
diff --git a/tests/unit/store/Vuex.spec.ts b/tests/unit/store/Vuex.spec.ts
index a61d6aec61..9bc57014da 100644
--- a/tests/unit/store/Vuex.spec.ts
+++ b/tests/unit/store/Vuex.spec.ts
@@ -169,7 +169,7 @@ describe("store/vuex.js test", () => {
           ],
           notes: [],
         },
-        phrases: {},
+        phrases: new Map(),
         isShowSinger: true,
         sequencerZoomX: 1,
         sequencerZoomY: 1,

From 541db78010610fbb09e65a776e25b98f5e1a7f2c Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Tue, 23 Jan 2024 01:50:46 +0900
Subject: [PATCH 50/59] =?UTF-8?q?[project-s]=20=E3=83=AC=E3=83=B3=E3=83=80?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8B?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AE=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1740)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* レンダリングできなかったときの表示を修正

* マウスを動かしたときにプレビュー処理が走るようにする
---
 src/components/Sing/ScoreSequencer.vue | 31 ++++++++++++++++----------
 src/store/singing.ts                   | 27 ++++++++++++++++++----
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 73a68ff000..5a45daa335 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -331,6 +331,7 @@ export default defineComponent({
     let dragStartNoteNumber = 0;
     let dragStartGuideLineTicks = 0;
     let draggingNoteId = ""; // FIXME: 無効状態はstring以外の型にする
+    let executePreviewProcess = false;
     let edited = false; // プレビュー終了時にScoreの変更を行うかどうかを表す変数
     // ダブルクリック
     let mouseDownNoteId: string | undefined;
@@ -518,17 +519,20 @@ export default defineComponent({
     };
 
     const preview = () => {
-      if (previewMode === "ADD") {
-        previewAdd();
-      }
-      if (previewMode === "MOVE") {
-        previewMove();
-      }
-      if (previewMode === "RESIZE_RIGHT") {
-        previewResizeRight();
-      }
-      if (previewMode === "RESIZE_LEFT") {
-        previewResizeLeft();
+      if (executePreviewProcess) {
+        if (previewMode === "ADD") {
+          previewAdd();
+        }
+        if (previewMode === "MOVE") {
+          previewMove();
+        }
+        if (previewMode === "RESIZE_RIGHT") {
+          previewResizeRight();
+        }
+        if (previewMode === "RESIZE_LEFT") {
+          previewResizeLeft();
+        }
+        executePreviewProcess = false;
       }
       previewRequestId = requestAnimationFrame(preview);
     };
@@ -628,6 +632,7 @@ export default defineComponent({
       dragStartNoteNumber = cursorNoteNumber;
       dragStartGuideLineTicks = guideLineTicks;
       draggingNoteId = note.id;
+      executePreviewProcess = true;
       edited = mode === "ADD";
       copiedNotesForPreview.clear();
       for (const copiedNote of copiedNotes) {
@@ -706,7 +711,9 @@ export default defineComponent({
       cursorX = getXInBorderBox(event.clientX, sequencerBodyElement);
       cursorY = getYInBorderBox(event.clientY, sequencerBodyElement);
 
-      if (!nowPreviewing.value) {
+      if (nowPreviewing.value) {
+        executePreviewProcess = true;
+      } else {
         const scrollLeft = sequencerBodyElement.scrollLeft;
         const cursorBaseX = (scrollLeft + cursorX) / zoomX.value;
         const cursorTicks = baseXToTick(cursorBaseX, tpqn.value);
diff --git a/src/store/singing.ts b/src/store/singing.ts
index 3733dea1f9..d99a094976 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -1060,7 +1060,10 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             continue;
           }
 
-          if (phrase.state === "WAITING_TO_BE_RENDERED") {
+          if (
+            phrase.state === "WAITING_TO_BE_RENDERED" ||
+            phrase.state === "COULD_NOT_RENDER"
+          ) {
             commit("SET_STATE_TO_PHRASE", {
               phraseKey,
               phraseState: "NOW_RENDERING",
@@ -1073,14 +1076,20 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           if (!phrase.query) {
             const engineId = phrase.singer.engineId;
             const frameRate = state.engineManifests[engineId].frameRate;
-            const restDurationSeconds = 1; // 仮置き
+            const restDurationSeconds = 1; // 前後の休符の長さはとりあえず1秒に設定
 
             const frameAudioQuery = await fetchQuery(
               phrase.singer.engineId,
               phrase.score,
               frameRate,
               restDurationSeconds
-            );
+            ).catch((error) => {
+              commit("SET_STATE_TO_PHRASE", {
+                phraseKey,
+                phraseState: "COULD_NOT_RENDER",
+              });
+              throw error;
+            });
             const phonemes = getPhonemes(frameAudioQuery);
 
             window.electron.logInfo(
@@ -1124,7 +1133,17 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             if (phraseData.blob) {
               window.electron.logInfo(`Loaded audio buffer from cache.`);
             } else {
-              phraseData.blob = await synthesize(phrase.singer, phrase.query);
+              const blob = await synthesize(phrase.singer, phrase.query).catch(
+                (error) => {
+                  commit("SET_STATE_TO_PHRASE", {
+                    phraseKey,
+                    phraseState: "COULD_NOT_RENDER",
+                  });
+                  throw error;
+                }
+              );
+
+              phraseData.blob = blob;
               phraseAudioBlobCache.set(phraseKey, phraseData.blob);
 
               window.electron.logInfo(`Synthesized.`);

From 0b37dca9df1caf27db5f61cebb9647ac65dc53b9 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Tue, 23 Jan 2024 03:09:43 +0900
Subject: [PATCH 51/59] =?UTF-8?q?[project-s]=20#1743=20=E3=81=AE=E3=83=9E?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#1744)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#1743 のマージミスを修正
---
 src/views/EditorHome.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/EditorHome.vue b/src/views/EditorHome.vue
index f54726448e..5e3734f510 100644
--- a/src/views/EditorHome.vue
+++ b/src/views/EditorHome.vue
@@ -208,6 +208,7 @@ import AcceptTermsDialog from "@/components/AcceptTermsDialog.vue";
 import DictionaryManageDialog from "@/components/DictionaryManageDialog.vue";
 import EngineManageDialog from "@/components/EngineManageDialog.vue";
 import ProgressDialog from "@/components/ProgressDialog.vue";
+import UpdateNotificationDialogContainer from "@/components/UpdateNotificationDialog/Container.vue";
 import SingerTab from "@/components/SingerTab.vue";
 import { AudioItem, EngineState } from "@/store/type";
 import {

From b5801ccb8a3dfced3c10684f634c8d53d9b8bac1 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Wed, 24 Jan 2024 00:20:44 +0900
Subject: [PATCH 52/59] =?UTF-8?q?[project-s]=20=E3=82=A8=E3=83=B3=E3=82=B8?=
 =?UTF-8?q?=E3=83=B3=E8=B5=B7=E5=8B=95=E3=82=92App.vue=E3=81=AB=E7=A7=BB?=
 =?UTF-8?q?=E7=AE=A1=20(#1746)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* エンジン起動をApp.vueに移管

* spaceへ

* ショートカットキー登録が間に合ってない
---
 ...61\343\203\263\343\202\271\345\233\263.md" |  28 ++--
 src/App.vue                                   | 103 +++++++++++--
 src/router/index.ts                           |   1 -
 src/views/EditorHome.vue                      | 141 ++++++------------
 4 files changed, 151 insertions(+), 122 deletions(-)

diff --git "a/docs/res/\350\265\267\345\213\225\343\202\267\343\203\274\343\202\261\343\203\263\343\202\271\345\233\263.md" "b/docs/res/\350\265\267\345\213\225\343\202\267\343\203\274\343\202\261\343\203\263\343\202\271\345\233\263.md"
index 191115bc70..57d00c8881 100644
--- "a/docs/res/\350\265\267\345\213\225\343\202\267\343\203\274\343\202\261\343\203\263\343\202\271\345\233\263.md"
+++ "b/docs/res/\350\265\267\345\213\225\343\202\267\343\203\274\343\202\261\343\203\263\343\202\271\345\233\263.md"
@@ -4,28 +4,16 @@
 flowchart
   174170["back.installVvppEngineWithWarning"] --> 786961["back.installVvppEngine"]
   764022["（画面読み込み）"] --> 698565["App.vue"]
-  764022 --> 332024["EditorHome.vue"]
   733212["back.createWindow"] -.-> 764022
   448821>"アプリ停止中"] -.-> 430173["app.ready"]
   style 448821 fill:#ffbbbb,stroke:#ff0000
   430173 -->|"ある"| 174170
   430173 -->|"ない"| 389651["back.start"]
-  698565 -.-> 704891>"アプリ実行中"]
+  332024["EditorHome.vue"] -.-> 704891>"アプリ実行中"]
   style 704891 fill:#bbbbff,stroke:#0000ff
-  332024 -.-> 704891
   786961 --> 389651
+  698565 --> 332024
   subgraph 332024["EditorHome.vue"]
-    709863["Vuex.GET_ENGINE_INFOS"] --> 773040["Vuex.POST_ENGINE_START"]
-    subgraph 773040["Vuex.POST_ENGINE_START"]
-      970396["get ALT_PORT_INFOS"] --> 467527["各エンジン"]
-      subgraph 467527["各エンジン"]
-        592206["Vuex.START_WAITING_ENGINE"] --> 799767["Vuex.FETCH_AND_SET_ENGINE_MANIFEST"]
-      end
-    end
-    subgraph 709863["Vuex.GET_ENGINE_INFOS"]
-      807081["back.get ENGINE_INFOS"] --> 423649["Vuex.set engineInfos"]
-      423649 --> 623418["Vuex.set engineIds"]
-    end
   end
   subgraph 389651["back.start"]
     967432["engine.runEngineAll"] --> 733212
@@ -47,9 +35,21 @@ flowchart
     546251{{"VVPPファイルがあるか"}}
   end
   subgraph 698565["App.vue"]
+    709863["Vuex.GET_ENGINE_INFOS"] --> 773040["Vuex.POST_ENGINE_START"]
     646647["Vuex.INIT_VUEX"] --> 632374["back.ON_VUEX_READY"]
+    632374 --> 709863
     subgraph 632374["back.ON_VUEX_READY"]
       225701["win.show"]
     end
+    subgraph 709863["Vuex.GET_ENGINE_INFOS"]
+      807081["back.get ENGINE_INFOS"] --> 423649["Vuex.set engineInfos"]
+      423649 --> 623418["Vuex.set engineIds"]
+    end
+    subgraph 773040["Vuex.POST_ENGINE_START"]
+      970396["get ALT_PORT_INFOS"] --> 467527["各エンジン"]
+      subgraph 467527["各エンジン"]
+        592206["Vuex.START_WAITING_ENGINE"] --> 799767["Vuex.FETCH_AND_SET_ENGINE_MANIFEST"]
+      end
+    end
   end
 ```
diff --git a/src/App.vue b/src/App.vue
index b392f1993d..304ae41451 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,30 +1,33 @@
 <template>
   <error-boundary>
-    <router-view />
+    <!-- TODO: メニューバーをEditorHomeから移動する -->
+    <router-view v-slot="{ Component }">
+      <keep-alive>
+        <component
+          :is="Component"
+          :is-engines-ready="isEnginesReady"
+          :project-file-path="projectFilePath"
+        />
+      </keep-alive>
+    </router-view>
   </error-boundary>
 </template>
 
 <script setup lang="ts">
-import { watch, computed } from "vue";
+import { watch, onMounted, ref, computed } from "vue";
 import { useGtm } from "@gtm-support/vue-gtm";
 import { useRoute } from "vue-router";
+import Mousetrap from "mousetrap";
+import { EngineId } from "./type/preload";
 import ErrorBoundary from "@/components/ErrorBoundary.vue";
 import { useStore } from "@/store";
+import { isOnCommandOrCtrlKeyDown } from "@/store/utility";
 
 const store = useStore();
-store.dispatch("INIT_VUEX");
-
-// URLパラメータに従ってマルチエンジンをオフにする
 const route = useRoute();
-const query = computed(() => route.query);
-watch(query, (newQuery) => {
-  if (newQuery) {
-    store.dispatch(
-      "SET_IS_MULTI_ENGINE_OFF_MODE",
-      newQuery["isMultiEngineOffMode"] === "true"
-    );
-  }
-});
+
+// TODO: プロジェクトファイルの読み込みもEditorHomeから移動する
+const projectFilePath = computed(() => route.query["projectFilePath"]);
 
 // Google Tag Manager
 const gtm = useGtm();
@@ -44,4 +47,76 @@ watch(
   },
   { immediate: true }
 );
+
+// ソフトウェアを初期化
+const isEnginesReady = ref(false);
+onMounted(async () => {
+  await store.dispatch("INIT_VUEX");
+
+  // Electronのデフォルトのundo/redoを無効化
+  const disableDefaultUndoRedo = (event: KeyboardEvent) => {
+    // ctrl+z, ctrl+shift+z, ctrl+y
+    if (
+      isOnCommandOrCtrlKeyDown(event) &&
+      (event.key == "z" || (!event.shiftKey && event.key == "y"))
+    ) {
+      event.preventDefault();
+    }
+  };
+  document.addEventListener("keydown", disableDefaultUndoRedo);
+
+  // ショートカットキー操作を止める条件の設定
+  // 止めるなら`true`を返す
+  Mousetrap.prototype.stopCallback = (
+    e: Mousetrap.ExtendedKeyboardEvent, // 未使用
+    element: Element,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    combo: string // 未使用
+  ) => {
+    return (
+      element.tagName === "INPUT" ||
+      element.tagName === "SELECT" ||
+      element.tagName === "TEXTAREA" ||
+      (element instanceof HTMLElement && element.contentEditable === "true") ||
+      // メニュー項目ではショートカットキーを無効化
+      element.classList.contains("q-item")
+    );
+  };
+
+  // エンジンの初期化開始
+
+  // エンジン情報取得
+  await store.dispatch("GET_ENGINE_INFOS");
+
+  // URLパラメータに従ってマルチエンジンをオフにする
+  const isMultiEngineOffMode = route.query["isMultiEngineOffMode"] === "true";
+  store.dispatch("SET_IS_MULTI_ENGINE_OFF_MODE", isMultiEngineOffMode);
+
+  // マルチエンジンオフモードのときはデフォルトエンジンだけにする
+  let engineIds: EngineId[];
+  if (isMultiEngineOffMode) {
+    const main = Object.values(store.state.engineInfos).find(
+      (engine) => engine.type === "default"
+    );
+    if (!main) {
+      throw new Error("No main engine found");
+    }
+    engineIds = [main.uuid];
+  } else {
+    engineIds = store.state.engineIds;
+  }
+  await store.dispatch("LOAD_USER_CHARACTER_ORDER");
+  await store.dispatch("POST_ENGINE_START", {
+    engineIds,
+  });
+
+  // 辞書を同期
+  await store.dispatch("SYNC_ALL_USER_DICT");
+
+  isEnginesReady.value = true;
+});
+
+// TODO: ダイアログ周りをEditorHomeから移動する
+
+// TODO: エンジン起動状態周りの処理と表示をEditorHomeから移動する
 </script>
diff --git a/src/router/index.ts b/src/router/index.ts
index 0993e305bb..7712e48b70 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -6,7 +6,6 @@ const routes: Array<RouteRecordRaw> = [
   {
     path: "/home",
     component: EditorHome,
-    props: (route) => ({ projectFilePath: route.query["projectFilePath"] }),
   },
   {
     path: "/singer-home",
diff --git a/src/views/EditorHome.vue b/src/views/EditorHome.vue
index 5e3734f510..889eb1d202 100644
--- a/src/views/EditorHome.vue
+++ b/src/views/EditorHome.vue
@@ -189,7 +189,6 @@ import { computed, onBeforeUpdate, onMounted, ref, VNodeRef, watch } from "vue";
 import draggable from "vuedraggable";
 import { QResizeObserver } from "quasar";
 import cloneDeep from "clone-deep";
-import Mousetrap from "mousetrap";
 import { useStore } from "@/store";
 import HeaderBar from "@/components/HeaderBar.vue";
 import AudioCell from "@/components/AudioCell.vue";
@@ -213,19 +212,18 @@ import SingerTab from "@/components/SingerTab.vue";
 import { AudioItem, EngineState } from "@/store/type";
 import {
   AudioKey,
-  EngineId,
   HotkeyActionType,
   HotkeyReturnType,
   PresetKey,
   SplitterPositionType,
   Voice,
 } from "@/type/preload";
-import { isOnCommandOrCtrlKeyDown } from "@/store/utility";
 import { parseCombo, setHotkeyFunctions } from "@/store/setting";
 
 const props =
   defineProps<{
-    projectFilePath: string;
+    projectFilePath?: string;
+    isEnginesReady: boolean;
   }>();
 
 const store = useStore();
@@ -500,17 +498,6 @@ const focusCell = ({
   });
 };
 
-// Electronのデフォルトのundo/redoを無効化
-const disableDefaultUndoRedo = (event: KeyboardEvent) => {
-  // ctrl+z, ctrl+shift+z, ctrl+y
-  if (
-    isOnCommandOrCtrlKeyDown(event) &&
-    (event.key == "z" || (!event.shiftKey && event.key == "y"))
-  ) {
-    event.preventDefault();
-  }
-};
-
 const userOrderedCharacterInfos = computed(
   () => store.state.userCharacterOrder
 );
@@ -549,94 +536,61 @@ watch(userOrderedCharacterInfos, (userOrderedCharacterInfos) => {
   }
 });
 
-// ソフトウェアを初期化
-const isCompletedInitialStartup = ref(false);
 onMounted(async () => {
-  await store.dispatch("GET_ENGINE_INFOS");
-
-  let engineIds: EngineId[];
-  if (store.state.isMultiEngineOffMode) {
-    // デフォルトエンジンだけを含める
-    const main = Object.values(store.state.engineInfos).find(
-      (engine) => engine.type === "default"
-    );
-    if (!main) {
-      throw new Error("No main engine found");
-    }
-    engineIds = [main.uuid];
-  } else {
-    engineIds = store.state.engineIds;
-  }
-  await store.dispatch("LOAD_USER_CHARACTER_ORDER");
-  await store.dispatch("POST_ENGINE_START", {
-    engineIds,
+  // ショートカットキーの設定
+  hotkeyActionsNative.forEach((item) => {
+    document.addEventListener("keyup", item);
   });
+});
 
-  // 辞書を同期
-  await store.dispatch("SYNC_ALL_USER_DICT");
-
-  // プロジェクトファイルが指定されていればロード
-  let projectFileLoaded = false;
-  if (props.projectFilePath != undefined && props.projectFilePath !== "") {
-    projectFileLoaded = await store.dispatch("LOAD_PROJECT_FILE", {
-      filePath: props.projectFilePath,
-    });
-  }
-
-  if (!projectFileLoaded) {
-    // 最初のAudioCellを作成
-    const audioItem = await store.dispatch("GENERATE_AUDIO_ITEM", {});
-    const newAudioKey = await store.dispatch("REGISTER_AUDIO_ITEM", {
-      audioItem,
-    });
-    focusCell({ audioKey: newAudioKey, focusTarget: "textField" });
-
-    // 最初の話者を初期化
-    store.dispatch("SETUP_SPEAKER", {
-      audioKeys: [newAudioKey],
-      engineId: audioItem.voice.engineId,
-      styleId: audioItem.voice.styleId,
-    });
-  }
+// ソフトウェアを初期化
+const isCompletedInitialStartup = ref(false);
+const unwatchIsEnginesReady = watch(
+  // TODO: 最初に１度だけ実行している。Vueっぽくないので解体する
+  () => props.isEnginesReady,
+  async (isEnginesReady) => {
+    if (!isEnginesReady) throw new Error("isEnginesReady should be true");
+
+    // プロジェクトファイルが指定されていればロード
+    let projectFileLoaded = false;
+    if (props.projectFilePath != undefined && props.projectFilePath !== "") {
+      projectFileLoaded = await store.dispatch("LOAD_PROJECT_FILE", {
+        filePath: props.projectFilePath,
+      });
+    }
 
-  // ショートカットキー操作を止める条件の設定
-  // 止めるなら`true`を返す
-  Mousetrap.prototype.stopCallback = (
-    e: Mousetrap.ExtendedKeyboardEvent, // 未使用
-    element: Element,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    combo: string // 未使用
-  ) => {
-    return (
-      element.tagName === "INPUT" ||
-      element.tagName === "SELECT" ||
-      element.tagName === "TEXTAREA" ||
-      (element instanceof HTMLElement && element.contentEditable === "true") ||
-      // メニュー項目ではショートカットキーを無効化
-      element.classList.contains("q-item")
-    );
-  };
+    if (!projectFileLoaded) {
+      // 最初のAudioCellを作成
+      const audioItem = await store.dispatch("GENERATE_AUDIO_ITEM", {});
+      const newAudioKey = await store.dispatch("REGISTER_AUDIO_ITEM", {
+        audioItem,
+      });
+      focusCell({ audioKey: newAudioKey, focusTarget: "textField" });
 
-  // ショートカットキーの設定
-  document.addEventListener("keydown", disableDefaultUndoRedo);
+      // 最初の話者を初期化
+      store.dispatch("SETUP_SPEAKER", {
+        audioKeys: [newAudioKey],
+        engineId: audioItem.voice.engineId,
+        styleId: audioItem.voice.styleId,
+      });
+    }
 
-  hotkeyActionsNative.forEach((item) => {
-    document.addEventListener("keyup", item);
-  });
+    // 設定の読み込みを待機する
+    // FIXME: 設定が必要な処理はINIT_VUEXを実行しているApp.vueで行うべき
+    await store.dispatch("WAIT_VUEX_READY", { timeout: 15000 });
 
-  // 設定の読み込みを待機する
-  // FIXME: 設定が必要な処理はINIT_VUEXを実行しているApp.vueで行うべき
-  await store.dispatch("WAIT_VUEX_READY", { timeout: 15000 });
+    isAcceptRetrieveTelemetryDialogOpenComputed.value =
+      store.state.acceptRetrieveTelemetry === "Unconfirmed";
 
-  isAcceptRetrieveTelemetryDialogOpenComputed.value =
-    store.state.acceptRetrieveTelemetry === "Unconfirmed";
+    isAcceptTermsDialogOpenComputed.value =
+      import.meta.env.MODE !== "development" &&
+      store.state.acceptTerms !== "Accepted";
 
-  isAcceptTermsDialogOpenComputed.value =
-    import.meta.env.MODE !== "development" &&
-    store.state.acceptTerms !== "Accepted";
+    isCompletedInitialStartup.value = true;
 
-  isCompletedInitialStartup.value = true;
-});
+    unwatchIsEnginesReady();
+  }
+);
 
 // エンジン待機
 // TODO: 個別のエンジンの状態をUIで確認できるようにする
@@ -868,6 +822,7 @@ const showAddAudioItemButton = computed(() => {
   return store.state.showAddAudioItemButton;
 });
 
+// 台本欄の空きスペースがクリックされたら選択解除
 const onAudioCellPaneClick = () => {
   if (
     store.state.experimentalSetting.enableMultiSelect &&

From cd41c30d54a387fc72a805f9fda3310f086f787e Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Thu, 25 Jan 2024 01:29:22 +0900
Subject: [PATCH 53/59] =?UTF-8?q?[project-s]=20=E3=83=A1=E3=83=8B=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E7=B5=B1=E4=B8=80=E3=81=97=E3=81=A6=E5=88=87?=
 =?UTF-8?q?=E3=82=8A=E6=9B=BF=E3=81=88UI=E3=82=92=E3=83=A1=E3=83=8B?=
 =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=81=AB=E8=BF=BD=E5=8A=A0=20(#1748)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* song側もなんとなく対応

* Talk用MenuBar移動

* singerhomeのメニューをリッチに

* 切替可能にした

* 画面サイズが小さくなると表示が崩れるのを直す

* lintエラー

* スナップショットアップデート

* †ダークモード†
---
 README.md                                     |   4 +-
 src/background.ts                             |   2 +-
 src/components/AccentPhrase.vue               |   2 +-
 src/components/AudioCell.vue                  |   2 +-
 .../{MenuBar.vue => BaseMenuBar.vue}          | 435 +++++-------------
 src/components/ContextMenu.vue                |   5 +-
 src/components/MenuButton.vue                 |   2 +-
 src/components/MenuItem.vue                   |   2 +-
 src/components/MinMaxCloseButtons.vue         |   1 -
 src/components/Sing/MenuBar.vue               | 343 ++++----------
 src/components/Sing/SequencerNote.vue         |   2 +-
 src/components/SingerTab.vue                  |  49 --
 src/components/Talk/MenuBar.vue               | 240 ++++++++++
 src/components/TitleBarButtons.vue            |   1 -
 src/components/TitleBarEditorSwitcher.vue     |  56 +++
 src/router/index.ts                           |   4 +-
 src/views/EditorHome.vue                      |  11 +-
 src/views/SingerHome.vue                      |  28 +-
 ...347\224\273\351\235\242-browser-win32.png" | Bin 47801 -> 48714 bytes
 tests/e2e/navigators.ts                       |   4 +-
 20 files changed, 541 insertions(+), 652 deletions(-)
 rename src/components/{MenuBar.vue => BaseMenuBar.vue} (58%)
 delete mode 100644 src/components/SingerTab.vue
 create mode 100644 src/components/Talk/MenuBar.vue
 create mode 100644 src/components/TitleBarEditorSwitcher.vue

diff --git a/README.md b/README.md
index 118044e815..6c519f141f 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ npm run electron:serve
 npm run browser:serve
 ```
 
-また、main ブランチのビルド結果がこちらにデプロイされています <https://voicevox-browser-dev.netlify.app/#/home>  
+また、main ブランチのビルド結果がこちらにデプロイされています <https://voicevox-browser-dev.netlify.app/#/talk>  
 今はローカル PC 上で音声合成エンジンを起動する必要があります。
 
 ## ビルド
@@ -108,7 +108,7 @@ Playwright を使用しているためテストパターンを生成すること
 **ブラウザ版を起動している状態で**以下のコマンドを実行してください。
 
 ```bash
-npx playwright codegen http://localhost:5173/#/home  --viewport-size=800,600
+npx playwright codegen http://localhost:5173/#/talk  --viewport-size=800,600
 ```
 
 詳細は [Playwright ドキュメントの Test generator](https://playwright.dev/docs/codegen-intro) を参照してください。
diff --git a/src/background.ts b/src/background.ts
index 3715c103b3..8347ee1089 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -465,7 +465,7 @@ async function loadUrl(obj: {
   projectFilePath?: string;
 }) {
   const fragment =
-    "#/home" +
+    "#/talk" +
     `?isMultiEngineOffMode=${obj?.isMultiEngineOffMode ?? false}` +
     `&projectFilePath=${obj?.projectFilePath ?? ""}`;
   return win.loadURL(`${firstUrl}${fragment}`);
diff --git a/src/components/AccentPhrase.vue b/src/components/AccentPhrase.vue
index 87cd278905..993b847f34 100644
--- a/src/components/AccentPhrase.vue
+++ b/src/components/AccentPhrase.vue
@@ -210,7 +210,7 @@ import { computed, ref } from "vue";
 import AudioAccent from "./AudioAccent.vue";
 import AudioParameter from "./AudioParameter.vue";
 import ContextMenu from "./ContextMenu.vue";
-import { MenuItemButton } from "./MenuBar.vue";
+import { MenuItemButton } from "./BaseMenuBar.vue";
 import { useStore } from "@/store";
 import { AudioKey, MoraDataType } from "@/type/preload";
 import { Mora } from "@/openapi/models/Mora";
diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index c710c002c0..5b55595893 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -113,7 +113,7 @@
 import { computed, watch, ref, nextTick } from "vue";
 import { QInput } from "quasar";
 import CharacterButton from "./CharacterButton.vue";
-import { MenuItemButton, MenuItemSeparator } from "./MenuBar.vue";
+import { MenuItemButton, MenuItemSeparator } from "./BaseMenuBar.vue";
 import ContextMenu from "./ContextMenu.vue";
 import { useStore } from "@/store";
 import { AudioKey, SplitTextWhenPasteType, Voice } from "@/type/preload";
diff --git a/src/components/MenuBar.vue b/src/components/BaseMenuBar.vue
similarity index 58%
rename from src/components/MenuBar.vue
rename to src/components/BaseMenuBar.vue
index 4784bedd2a..ea45d2fe34 100644
--- a/src/components/MenuBar.vue
+++ b/src/components/BaseMenuBar.vue
@@ -21,23 +21,17 @@
       {{ titleText }}
     </div>
     <q-space />
+    <title-bar-editor-switcher />
     <title-bar-buttons />
   </q-bar>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
-import {
-  generateAndConnectAndSaveAudioWithDialog,
-  multiGenerateAndSaveAudioWithDialog,
-  generateAndSaveOneAudioWithDialog,
-  connectAndExportTextWithDialog,
-} from "./Dialog";
 import MenuButton from "./MenuButton.vue";
 import TitleBarButtons from "./TitleBarButtons.vue";
+import TitleBarEditorSwitcher from "./TitleBarEditorSwitcher.vue";
 import { useStore } from "@/store";
-import { HotkeyActionType, HotkeyReturnType } from "@/type/preload";
-import { setHotkeyFunctions } from "@/store/setting";
 import { base64ImageToUri } from "@/helpers/imageHelper";
 
 export type MenuItemBase<T extends string> = {
@@ -68,6 +62,12 @@ export type MenuItemData = MenuItemSeparator | MenuItemRoot | MenuItemButton;
 
 export type MenuItemType = MenuItemData["type"];
 
+const props =
+  defineProps<{
+    /** 「ファイル」メニューのサブメニュー */
+    fileSubMenuData: MenuItemData[];
+  }>();
+
 const store = useStore();
 const currentVersion = ref("");
 
@@ -119,94 +119,6 @@ watch(titleText, (newTitle) => {
   window.document.title = newTitle;
 });
 
-const createNewProject = async () => {
-  if (!uiLocked.value) {
-    await store.dispatch("CREATE_NEW_PROJECT", {});
-  }
-};
-
-const generateAndSaveAllAudio = async () => {
-  if (!uiLocked.value) {
-    await multiGenerateAndSaveAudioWithDialog({
-      audioKeys: store.state.audioKeys,
-      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
-      dispatch: store.dispatch,
-    });
-  }
-};
-
-const generateAndConnectAndSaveAllAudio = async () => {
-  if (!uiLocked.value) {
-    await generateAndConnectAndSaveAudioWithDialog({
-      dispatch: store.dispatch,
-      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
-    });
-  }
-};
-
-const generateAndSaveSelectedAudio = async () => {
-  if (uiLocked.value) return;
-
-  const activeAudioKey = store.getters.ACTIVE_AUDIO_KEY;
-  if (activeAudioKey == undefined) {
-    store.dispatch("SHOW_ALERT_DIALOG", {
-      title: "テキスト欄が選択されていません",
-      message: "音声を書き出したいテキスト欄を選択してください。",
-    });
-    return;
-  }
-
-  const selectedAudioKeys = store.getters.SELECTED_AUDIO_KEYS;
-  if (
-    store.state.experimentalSetting.enableMultiSelect &&
-    selectedAudioKeys.length > 1
-  ) {
-    await multiGenerateAndSaveAudioWithDialog({
-      audioKeys: selectedAudioKeys,
-      dispatch: store.dispatch,
-      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
-    });
-  } else {
-    await generateAndSaveOneAudioWithDialog({
-      audioKey: activeAudioKey,
-      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
-      dispatch: store.dispatch,
-    });
-  }
-};
-
-const connectAndExportText = async () => {
-  if (!uiLocked.value) {
-    await connectAndExportTextWithDialog({
-      dispatch: store.dispatch,
-      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
-    });
-  }
-};
-
-const importTextFile = () => {
-  if (!uiLocked.value) {
-    store.dispatch("COMMAND_IMPORT_FROM_FILE", {});
-  }
-};
-
-const saveProject = async () => {
-  if (!uiLocked.value) {
-    await store.dispatch("SAVE_PROJECT_FILE", { overwrite: true });
-  }
-};
-
-const saveProjectAs = async () => {
-  if (!uiLocked.value) {
-    await store.dispatch("SAVE_PROJECT_FILE", {});
-  }
-};
-
-const importProject = () => {
-  if (!uiLocked.value) {
-    store.dispatch("LOAD_PROJECT_FILE", {});
-  }
-};
 const closeAllDialog = () => {
   store.dispatch("SET_DIALOG_OPEN", {
     isSettingDialogOpen: false,
@@ -234,94 +146,111 @@ const openHelpDialog = () => {
   });
 };
 
-const menudata = ref<MenuItemData[]>([
-  {
-    type: "root",
-    label: "ファイル",
-    onClick: () => {
-      closeAllDialog();
-    },
-    disableWhenUiLocked: false,
-    subMenu: [
-      {
-        type: "button",
-        label: "音声書き出し",
-        onClick: () => {
-          generateAndSaveAllAudio();
-        },
-        disableWhenUiLocked: true,
-      },
-      {
-        type: "button",
-        label: "選択音声を書き出し",
-        onClick: () => {
-          generateAndSaveSelectedAudio();
-        },
-        disableWhenUiLocked: true,
-      },
+// 「エンジン」メニューのエンジン毎の項目
+const engineSubMenuData = computed<MenuItemData[]>(() => {
+  let subMenu: MenuItemData[] = [];
+
+  if (Object.values(engineInfos.value).length === 1) {
+    const engineInfo = Object.values(engineInfos.value)[0];
+    subMenu = [
       {
         type: "button",
-        label: "音声を繋げて書き出し",
+        label: "再起動",
         onClick: () => {
-          generateAndConnectAndSaveAllAudio();
+          store.dispatch("RESTART_ENGINES", {
+            engineIds: [engineInfo.uuid],
+          });
         },
-        disableWhenUiLocked: true,
+        disableWhenUiLocked: false,
       },
-      { type: "separator" },
+    ].filter((x) => x) as MenuItemData[];
+  } else {
+    subMenu = [
+      ...store.getters.GET_SORTED_ENGINE_INFOS.map(
+        (engineInfo) =>
+          ({
+            type: "root",
+            label: engineInfo.name,
+            icon:
+              engineManifests.value[engineInfo.uuid] &&
+              base64ImageToUri(engineManifests.value[engineInfo.uuid].icon),
+            subMenu: [
+              engineInfo.path && {
+                type: "button",
+                label: "フォルダを開く",
+                onClick: () => {
+                  store.dispatch("OPEN_ENGINE_DIRECTORY", {
+                    engineId: engineInfo.uuid,
+                  });
+                },
+                disableWhenUiLocked: false,
+              },
+              {
+                type: "button",
+                label: "再起動",
+                onClick: () => {
+                  store.dispatch("RESTART_ENGINES", {
+                    engineIds: [engineInfo.uuid],
+                  });
+                },
+                disableWhenUiLocked: false,
+              },
+            ].filter((x) => x),
+          } as MenuItemRoot)
+      ),
       {
-        type: "button",
-        label: "テキストを繋げて書き出し",
-        onClick: () => {
-          connectAndExportText();
-        },
-        disableWhenUiLocked: true,
+        type: "separator",
       },
       {
         type: "button",
-        label: "テキスト読み込み",
+        label: "全てのエンジンを再起動",
         onClick: () => {
-          importTextFile();
-        },
-        disableWhenUiLocked: true,
-      },
-      { type: "separator" },
-      {
-        type: "button",
-        label: "新規プロジェクト",
-        onClick: createNewProject,
-        disableWhenUiLocked: true,
-      },
-      {
-        type: "button",
-        label: "プロジェクトを上書き保存",
-        onClick: async () => {
-          await saveProject();
-        },
-        disableWhenUiLocked: true,
-      },
-      {
-        type: "button",
-        label: "プロジェクトを名前を付けて保存",
-        onClick: async () => {
-          await saveProjectAs();
+          store.dispatch("RESTART_ENGINES", { engineIds: engineIds.value });
         },
-        disableWhenUiLocked: true,
+        disableWhenUiLocked: false,
       },
-      {
-        type: "button",
-        label: "プロジェクト読み込み",
-        onClick: () => {
-          importProject();
-        },
-        disableWhenUiLocked: true,
+    ];
+  }
+  if (enableMultiEngine.value) {
+    subMenu.push({
+      type: "button",
+      label: "エンジンの管理",
+      onClick: () => {
+        store.dispatch("SET_DIALOG_OPEN", {
+          isEngineManageDialogOpen: true,
+        });
       },
-      {
-        type: "root",
-        label: "最近使ったプロジェクト",
-        disableWhenUiLocked: true,
-        subMenu: [],
+      disableWhenUiLocked: false,
+    });
+  }
+  // マルチエンジンオフモードの解除
+  if (store.state.isMultiEngineOffMode) {
+    subMenu.push({
+      type: "button",
+      label: "マルチエンジンをオンにして再読み込み",
+      onClick() {
+        store.dispatch("RELOAD_APP", {
+          isMultiEngineOffMode: false,
+        });
       },
-    ],
+      disableWhenUiLocked: false,
+      disablreloadingLocked: true,
+    });
+  }
+
+  return subMenu;
+});
+
+// メニュー一覧
+const menudata = computed<MenuItemData[]>(() => [
+  {
+    type: "root",
+    label: "ファイル",
+    onClick: () => {
+      closeAllDialog();
+    },
+    disableWhenUiLocked: false,
+    subMenu: props.fileSubMenuData,
   },
   {
     type: "root",
@@ -330,7 +259,7 @@ const menudata = ref<MenuItemData[]>([
       closeAllDialog();
     },
     disableWhenUiLocked: false,
-    subMenu: [],
+    subMenu: engineSubMenuData.value,
   },
   {
     type: "root",
@@ -430,164 +359,6 @@ const reassignSubMenuOpen = (idx: number) => {
   }
 };
 
-const hotkeyMap = new Map<HotkeyActionType, () => HotkeyReturnType>([
-  ["新規プロジェクト", createNewProject],
-  ["音声書き出し", generateAndSaveAllAudio],
-  ["選択音声を書き出し", generateAndSaveSelectedAudio],
-  ["音声を繋げて書き出し", generateAndConnectAndSaveAllAudio],
-  ["テキスト読み込む", importTextFile],
-  ["プロジェクトを上書き保存", saveProject],
-  ["プロジェクトを名前を付けて保存", saveProjectAs],
-  ["プロジェクト読み込み", importProject],
-]);
-
-setHotkeyFunctions(hotkeyMap);
-
-// エンジン毎の項目を追加
-async function updateEngines() {
-  const engineMenu = menudata.value.find(
-    (x) => x.type === "root" && x.label === "エンジン"
-  ) as MenuItemRoot;
-  if (Object.values(engineInfos.value).length === 1) {
-    const engineInfo = Object.values(engineInfos.value)[0];
-    engineMenu.subMenu = [
-      {
-        type: "button",
-        label: "再起動",
-        onClick: () => {
-          store.dispatch("RESTART_ENGINES", {
-            engineIds: [engineInfo.uuid],
-          });
-        },
-        disableWhenUiLocked: false,
-      },
-    ].filter((x) => x) as MenuItemData[];
-  } else {
-    engineMenu.subMenu = [
-      ...store.getters.GET_SORTED_ENGINE_INFOS.map(
-        (engineInfo) =>
-          ({
-            type: "root",
-            label: engineInfo.name,
-            icon:
-              engineManifests.value[engineInfo.uuid] &&
-              base64ImageToUri(engineManifests.value[engineInfo.uuid].icon),
-            subMenu: [
-              engineInfo.path && {
-                type: "button",
-                label: "フォルダを開く",
-                onClick: () => {
-                  store.dispatch("OPEN_ENGINE_DIRECTORY", {
-                    engineId: engineInfo.uuid,
-                  });
-                },
-                disableWhenUiLocked: false,
-              },
-              {
-                type: "button",
-                label: "再起動",
-                onClick: () => {
-                  store.dispatch("RESTART_ENGINES", {
-                    engineIds: [engineInfo.uuid],
-                  });
-                },
-                disableWhenUiLocked: false,
-              },
-            ].filter((x) => x),
-          } as MenuItemRoot)
-      ),
-      {
-        type: "separator",
-      },
-      {
-        type: "button",
-        label: "全てのエンジンを再起動",
-        onClick: () => {
-          store.dispatch("RESTART_ENGINES", { engineIds: engineIds.value });
-        },
-        disableWhenUiLocked: false,
-      },
-    ];
-  }
-  if (enableMultiEngine.value) {
-    engineMenu.subMenu.push({
-      type: "button",
-      label: "エンジンの管理",
-      onClick: () => {
-        store.dispatch("SET_DIALOG_OPEN", {
-          isEngineManageDialogOpen: true,
-        });
-      },
-      disableWhenUiLocked: false,
-    });
-  }
-  // マルチエンジンオフモードの解除
-  if (store.state.isMultiEngineOffMode) {
-    engineMenu.subMenu.push({
-      type: "button",
-      label: "マルチエンジンをオンにして再読み込み",
-      onClick() {
-        store.dispatch("RELOAD_APP", {
-          isMultiEngineOffMode: false,
-        });
-      },
-      disableWhenUiLocked: false,
-      disablreloadingLocked: true,
-    });
-  }
-}
-// engineInfos、engineManifests、enableMultiEngineを見て動的に更新できるようにする
-// FIXME: computedにする
-watch([engineInfos, engineManifests, enableMultiEngine], updateEngines, {
-  immediate: true,
-});
-
-// 「最近開いたプロジェクト」の更新
-async function updateRecentProjects() {
-  const projectsMenu = menudata.value.find(
-    (x) => x.type === "root" && x.label === "ファイル"
-  ) as MenuItemRoot;
-  const recentProjectsMenu = projectsMenu.subMenu.find(
-    (x) => x.type === "root" && x.label === "最近使ったプロジェクト"
-  ) as MenuItemRoot;
-
-  const recentlyUsedProjects = await store.dispatch(
-    "GET_RECENTLY_USED_PROJECTS"
-  );
-  recentProjectsMenu.subMenu =
-    recentlyUsedProjects.length === 0
-      ? [
-          {
-            type: "button",
-            label: "最近使ったプロジェクトはありません",
-            onClick: () => {
-              // 何もしない
-            },
-            disabled: true,
-            disableWhenUiLocked: false,
-          },
-        ]
-      : recentlyUsedProjects.map(
-          (projectFilePath) =>
-            ({
-              type: "button",
-              label: projectFilePath,
-              onClick: () => {
-                store.dispatch("LOAD_PROJECT_FILE", {
-                  filePath: projectFilePath,
-                });
-              },
-              disableWhenUiLocked: false,
-            } as MenuItemData)
-        );
-}
-
-const projectFilePath = computed(() => store.state.projectFilePath);
-
-watch(projectFilePath, updateRecentProjects, {
-  immediate: true,
-});
-
 watch(uiLocked, () => {
   // UIのロックが解除された時に再びメニューが開かれてしまうのを防ぐ
   if (uiLocked.value) {
@@ -610,10 +381,10 @@ watch(uiLocked, () => {
 
 .q-bar {
   min-height: vars.$menubar-height;
-  -webkit-app-region: drag;
-  > .q-btn {
+  -webkit-app-region: drag; // Electronのドラッグ領域
+  :deep(.q-btn) {
     margin-left: 0;
-    -webkit-app-region: no-drag;
+    -webkit-app-region: no-drag; // Electronのドラッグ領域対象から外す
   }
 }
 
diff --git a/src/components/ContextMenu.vue b/src/components/ContextMenu.vue
index 49376b0066..5716c5704a 100644
--- a/src/components/ContextMenu.vue
+++ b/src/components/ContextMenu.vue
@@ -29,7 +29,10 @@
 import { computed, onMounted, onUnmounted, ref } from "vue";
 import { QMenu } from "quasar";
 import MenuItem from "@/components/MenuItem.vue";
-import { MenuItemButton, MenuItemSeparator } from "@/components/MenuBar.vue";
+import {
+  MenuItemButton,
+  MenuItemSeparator,
+} from "@/components/BaseMenuBar.vue";
 import { useStore } from "@/store";
 
 defineProps<{
diff --git a/src/components/MenuButton.vue b/src/components/MenuButton.vue
index 7e4fcac61e..3fa3fd20f0 100644
--- a/src/components/MenuButton.vue
+++ b/src/components/MenuButton.vue
@@ -44,7 +44,7 @@
 import { computed, ref, watch } from "vue";
 import { debounce } from "quasar";
 import MenuItem from "@/components/MenuItem.vue";
-import { MenuItemData } from "@/components/MenuBar.vue";
+import { MenuItemData } from "@/components/BaseMenuBar.vue";
 import { useStore } from "@/store";
 
 const props = withDefaults(
diff --git a/src/components/MenuItem.vue b/src/components/MenuItem.vue
index 6f2f71c68f..5d6f8a3611 100644
--- a/src/components/MenuItem.vue
+++ b/src/components/MenuItem.vue
@@ -72,7 +72,7 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
-import type { MenuItemData } from "@/components/MenuBar.vue";
+import type { MenuItemData } from "@/components/BaseMenuBar.vue";
 import { useStore } from "@/store";
 import { hotkeyActionSchema } from "@/type/preload";
 const props = withDefaults(
diff --git a/src/components/MinMaxCloseButtons.vue b/src/components/MinMaxCloseButtons.vue
index 116c0994ad..cdfe2b75c9 100644
--- a/src/components/MinMaxCloseButtons.vue
+++ b/src/components/MinMaxCloseButtons.vue
@@ -118,7 +118,6 @@ const isMaximized = computed(() => store.state.isMaximized);
 }
 
 .title-bar-buttons {
-  -webkit-app-region: no-drag;
   overflow: visible;
 }
 
diff --git a/src/components/Sing/MenuBar.vue b/src/components/Sing/MenuBar.vue
index b8e8cbb500..b9ab6c0646 100644
--- a/src/components/Sing/MenuBar.vue
+++ b/src/components/Sing/MenuBar.vue
@@ -1,270 +1,123 @@
 <template>
-  <q-bar class="bg-background q-pa-none relative-position">
-    <menu-button
-      v-for="(root, index) of menudata"
-      :key="index"
-      v-model:selected="subMenuOpenFlags[index]"
-      :menudata="root"
-      :disable="menubarLocked"
-      @mouseover="reassignSubMenuOpen(index)"
-      @mouseleave="
-        root.type === 'button' ? (subMenuOpenFlags[index] = false) : undefined
-      "
-    />
-    <q-space />
-    <min-max-close-buttons v-if="!$q.platform.is.mac" />
-  </q-bar>
+  <base-menu-bar :file-sub-menu-data="fileSubMenuData" />
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { defineComponent, ref, computed, ComputedRef } from "vue";
 import { useStore } from "@/store";
 import MenuButton from "@/components/MenuButton.vue";
 import MinMaxCloseButtons from "@/components/MinMaxCloseButtons.vue";
 import { HotkeyActionType, HotkeyReturnType } from "@/type/preload";
 import { setHotkeyFunctions } from "@/store/setting";
+import BaseMenuBar, { MenuItemData } from "@/components/BaseMenuBar.vue";
 
-type SingMenuItemBase<T extends string> = {
-  type: T;
-  label?: string;
-};
+const store = useStore();
+const uiLocked = computed(() => store.getters.UI_LOCKED);
 
-export type MenuItemSeparator = SingMenuItemBase<"separator">;
+const createNewSingProject = async () => {
+  if (uiLocked.value) return;
+  return null;
+  // await store.dispatch("CREATE_NEW_SING_PROJECT", {});
+};
 
-export type MenuItemRoot = SingMenuItemBase<"root"> & {
-  onClick: () => void;
-  subMenu: MenuItemData[];
-  icon?: string;
-  disabled?: boolean;
-  disableWhenUiLocked: boolean;
-  disablreloadingLocked?: boolean;
+const openSingProject = async () => {
+  if (uiLocked.value) return;
+  return null;
+  // await store.dispatch("OPEN_SING_PROJECT", {});
 };
 
-export type MenuItemButton = SingMenuItemBase<"button"> & {
-  onClick: () => void;
-  icon?: string;
-  disabled?: boolean;
-  disableWhenUiLocked: boolean;
-  disablreloadingLocked?: boolean;
+const saveSingProject = async () => {
+  if (uiLocked.value) return;
+  return null;
+  // await store.dispatch("SAVE_SING_PROJECT", {});
 };
 
-export type MenuItemCheckbox = SingMenuItemBase<"checkbox"> & {
-  onClick: () => void;
-  checked: ComputedRef<boolean>;
-  icon?: string;
-  disabled?: boolean;
-  disableWhenUiLocked: boolean;
-  disablreloadingLocked?: boolean;
+const saveAsSingProject = async () => {
+  if (uiLocked.value) return;
+  return null;
+  // await store.dispatch("SAVE_AS_SING_PROJECT", {});
 };
 
-export type MenuItemData = MenuItemSeparator | MenuItemRoot | MenuItemButton;
+const importMidiFile = async () => {
+  if (uiLocked.value) return;
+  await store.dispatch("IMPORT_MIDI_FILE", {});
+};
 
-export type MenuItemType = MenuItemData["type"];
+const importMusicXMLFile = async () => {
+  if (uiLocked.value) return;
+  await store.dispatch("IMPORT_MUSICXML_FILE", {});
+};
 
-export default defineComponent({
-  name: "SingMenuBar",
+const exportWaveFile = async () => {
+  if (uiLocked.value) return;
+  await store.dispatch("EXPORT_WAVE_FILE", {});
+};
 
-  components: {
-    MenuButton,
-    MinMaxCloseButtons,
+const fileSubMenuData: MenuItemData[] = [
+  {
+    type: "button",
+    label: "新規",
+    onClick: () => {
+      createNewSingProject();
+    },
+    disableWhenUiLocked: true,
   },
-
-  setup() {
-    const store = useStore();
-    const currentVersion = ref("");
-    window.electron.getAppInfos().then((obj) => {
-      currentVersion.value = obj.version;
-    });
-    const isFullscreen = computed(() => store.getters.IS_FULLSCREEN);
-    const menubarLocked = false; // computed(() => store.getters.IS_SING_MENUBAR_LOCKED);
-
-    const createNewSingProject = async () => {
-      return null;
-      // await store.dispatch("CREATE_NEW_SING_PROJECT", {});
-    };
-
-    const openSingProject = async () => {
-      return null;
-      // await store.dispatch("OPEN_SING_PROJECT", {});
-    };
-
-    const saveSingProject = async () => {
-      return null;
-      // await store.dispatch("SAVE_SING_PROJECT", {});
-    };
-
-    const saveAsSingProject = async () => {
-      return null;
-      // await store.dispatch("SAVE_AS_SING_PROJECT", {});
-    };
-
-    const importMidiFile = async () => {
-      await store.dispatch("IMPORT_MIDI_FILE", {});
-    };
-
-    const importMusicXMLFile = async () => {
-      await store.dispatch("IMPORT_MUSICXML_FILE", {});
-    };
-
-    const exportWaveFile = async () => {
-      await store.dispatch("EXPORT_WAVE_FILE", {});
-    };
-
-    const openHelpDialog = () => {
-      store.dispatch("SET_DIALOG_OPEN", {
-        isHelpDialogOpen: true,
-      });
-    };
-
-    const closeAllDialog = () => {
-      return null;
-    };
-
-    const menudata = ref<MenuItemData[]>([
-      {
-        type: "root",
-        label: "ファイル",
-        onClick: () => {
-          closeAllDialog();
-        },
-        disableWhenUiLocked: false,
-        subMenu: [
-          {
-            type: "button",
-            label: "新規",
-            onClick: () => {
-              createNewSingProject();
-            },
-            disableWhenUiLocked: true,
-          },
-          {
-            type: "button",
-            label: "開く",
-            onClick: () => {
-              openSingProject();
-            },
-            disableWhenUiLocked: true,
-          },
-          {
-            type: "button",
-            label: "保存",
-            onClick: () => {
-              saveSingProject();
-            },
-            disableWhenUiLocked: true,
-          },
-          {
-            type: "button",
-            label: "別名で保存",
-            onClick: () => {
-              saveAsSingProject();
-            },
-            disableWhenUiLocked: true,
-          },
-          { type: "separator" },
-          {
-            type: "button",
-            label: "MIDI読み込み",
-            onClick: () => {
-              importMidiFile();
-            },
-            disableWhenUiLocked: true,
-          },
-          {
-            type: "button",
-            label: "MusicXML読み込み",
-            onClick: () => {
-              importMusicXMLFile();
-            },
-            disableWhenUiLocked: true,
-          },
-          { type: "separator" },
-          {
-            type: "button",
-            label: "音声を出力",
-            onClick: () => {
-              exportWaveFile();
-            },
-            disableWhenUiLocked: true,
-          },
-        ],
-      },
-      {
-        type: "button",
-        label: "ヘルプ",
-        onClick: () => {
-          if (store.state.isHelpDialogOpen) closeAllDialog();
-          else {
-            closeAllDialog();
-            openHelpDialog();
-          }
-        },
-        disableWhenUiLocked: false,
-      },
-    ]);
-
-    const subMenuOpenFlags = ref(
-      [...Array(menudata.value.length)].map(() => false)
-    );
-
-    const reassignSubMenuOpen = (idx: number) => {
-      if (subMenuOpenFlags.value[idx]) return;
-      if (subMenuOpenFlags.value.find((x) => x)) {
-        const arr = [...Array(menudata.value.length)].map(() => false);
-        arr[idx] = true;
-        subMenuOpenFlags.value = arr;
-      }
-    };
-
-    const hotkeyMap = new Map<HotkeyActionType, () => HotkeyReturnType>([
-      // NOTE: 初期設定なし
-      // ["新規", createNewSingProject],
-    ]);
-
-    setHotkeyFunctions(hotkeyMap);
-
-    return {
-      currentVersion,
-      isFullscreen,
-      menubarLocked,
-      subMenuOpenFlags,
-      reassignSubMenuOpen,
-      menudata,
-    };
+  {
+    type: "button",
+    label: "開く",
+    onClick: () => {
+      openSingProject();
+    },
+    disableWhenUiLocked: true,
   },
-});
-</script>
-
-<style lang="scss">
-@use '@/styles/colors' as colors;
-
-.active-menu {
-  background-color: rgba(colors.$primary-rgb, 0.3) !important;
-}
-</style>
-
-<style scoped lang="scss">
-@use '@/styles/variables' as vars;
-@use '@/styles/colors' as colors;
-
-.q-bar {
-  align-items: center;
-  min-height: vars.$menubar-height;
-  -webkit-app-region: drag;
-  > .q-btn {
-    margin-left: 0;
-    -webkit-app-region: no-drag;
-  }
-}
+  {
+    type: "button",
+    label: "保存",
+    onClick: () => {
+      saveSingProject();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "別名で保存",
+    onClick: () => {
+      saveAsSingProject();
+    },
+    disableWhenUiLocked: true,
+  },
+  { type: "separator" },
+  {
+    type: "button",
+    label: "MIDI読み込み",
+    onClick: () => {
+      importMidiFile();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "MusicXML読み込み",
+    onClick: () => {
+      importMusicXMLFile();
+    },
+    disableWhenUiLocked: true,
+  },
+  { type: "separator" },
+  {
+    type: "button",
+    label: "音声を出力",
+    onClick: () => {
+      exportWaveFile();
+    },
+    disableWhenUiLocked: true,
+  },
+];
 
-.window-logo {
-  height: vars.$menubar-height;
-}
+const hotkeyMap = new Map<HotkeyActionType, () => HotkeyReturnType>([
+  // NOTE: 初期設定なし
+  // ["新規", createNewSingProject],
+]);
 
-.window-title {
-  height: vars.$menubar-height;
-  margin-right: 10%;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-</style>
+setHotkeyFunctions(hotkeyMap);
+</script>
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index e949f875ce..7d5dba70c7 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -42,7 +42,7 @@ import {
   noteNumberToBaseY,
 } from "@/sing/viewHelper";
 import ContextMenu from "@/components/ContextMenu.vue";
-import { MenuItemButton } from "@/components/MenuBar.vue";
+import { MenuItemButton } from "@/components/BaseMenuBar.vue";
 
 type NoteState = "NORMAL" | "SELECTED" | "OVERLAPPING";
 
diff --git a/src/components/SingerTab.vue b/src/components/SingerTab.vue
deleted file mode 100644
index 311b1461c9..0000000000
--- a/src/components/SingerTab.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <nav role="tab">
-    <ul class="singer-tab">
-      <li class="singer-tab-item">
-        <router-link to="/home">ボイス</router-link>
-      </li>
-      <li class="singer-tab-item">
-        <router-link to="/singer-home">シング</router-link>
-      </li>
-    </ul>
-  </nav>
-</template>
-
-<script lang="ts">
-import { defineComponent, onMounted } from "vue";
-//import { useStore } from "@/store";
-//import { useRoute, useRouter } from "vue-router";
-export default defineComponent({
-  setup() {
-    //const store = useStore();
-    onMounted(async () => {
-      return null;
-    });
-    return {};
-  },
-});
-</script>
-
-<style scoped lang="scss">
-@use '@/styles/variables' as vars;
-@use '@/styles/colors' as colors;
-.singer-tab {
-  border-bottom: 1px solid colors.$splitter;
-  display: flex;
-  list-style: none;
-  margin-bottom: 0;
-  padding-left: 0;
-}
-.singer-tab a {
-  display: block;
-  color: colors.$display;
-  border-bottom: 2px solid transparent;
-  text-decoration: none;
-  padding: 8px;
-}
-.singer-tab-item a.router-link-exact-active {
-  border-bottom-color: colors.$primary;
-}
-</style>
diff --git a/src/components/Talk/MenuBar.vue b/src/components/Talk/MenuBar.vue
new file mode 100644
index 0000000000..2d9bae2522
--- /dev/null
+++ b/src/components/Talk/MenuBar.vue
@@ -0,0 +1,240 @@
+<template>
+  <base-menu-bar :file-sub-menu-data="fileSubMenuData" />
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from "vue";
+import {
+  generateAndConnectAndSaveAudioWithDialog,
+  multiGenerateAndSaveAudioWithDialog,
+  generateAndSaveOneAudioWithDialog,
+  connectAndExportTextWithDialog,
+} from "@/components/Dialog";
+import BaseMenuBar, { MenuItemData } from "@/components/BaseMenuBar.vue";
+
+import { useStore } from "@/store";
+import { HotkeyActionType, HotkeyReturnType } from "@/type/preload";
+import { setHotkeyFunctions } from "@/store/setting";
+
+const store = useStore();
+const uiLocked = computed(() => store.getters.UI_LOCKED);
+
+const createNewProject = async () => {
+  if (!uiLocked.value) {
+    await store.dispatch("CREATE_NEW_PROJECT", {});
+  }
+};
+
+const generateAndSaveAllAudio = async () => {
+  if (!uiLocked.value) {
+    await multiGenerateAndSaveAudioWithDialog({
+      audioKeys: store.state.audioKeys,
+      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
+      dispatch: store.dispatch,
+    });
+  }
+};
+
+const generateAndConnectAndSaveAllAudio = async () => {
+  if (!uiLocked.value) {
+    await generateAndConnectAndSaveAudioWithDialog({
+      dispatch: store.dispatch,
+      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
+    });
+  }
+};
+
+const generateAndSaveSelectedAudio = async () => {
+  if (uiLocked.value) return;
+
+  const activeAudioKey = store.getters.ACTIVE_AUDIO_KEY;
+  if (activeAudioKey == undefined) {
+    store.dispatch("SHOW_ALERT_DIALOG", {
+      title: "テキスト欄が選択されていません",
+      message: "音声を書き出したいテキスト欄を選択してください。",
+    });
+    return;
+  }
+
+  const selectedAudioKeys = store.getters.SELECTED_AUDIO_KEYS;
+  if (
+    store.state.experimentalSetting.enableMultiSelect &&
+    selectedAudioKeys.length > 1
+  ) {
+    await multiGenerateAndSaveAudioWithDialog({
+      audioKeys: selectedAudioKeys,
+      dispatch: store.dispatch,
+      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
+    });
+  } else {
+    await generateAndSaveOneAudioWithDialog({
+      audioKey: activeAudioKey,
+      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
+      dispatch: store.dispatch,
+    });
+  }
+};
+
+const connectAndExportText = async () => {
+  if (!uiLocked.value) {
+    await connectAndExportTextWithDialog({
+      dispatch: store.dispatch,
+      disableNotifyOnGenerate: store.state.confirmedTips.notifyOnGenerate,
+    });
+  }
+};
+
+const importTextFile = () => {
+  if (!uiLocked.value) {
+    store.dispatch("COMMAND_IMPORT_FROM_FILE", {});
+  }
+};
+
+const saveProject = async () => {
+  if (!uiLocked.value) {
+    await store.dispatch("SAVE_PROJECT_FILE", { overwrite: true });
+  }
+};
+
+const saveProjectAs = async () => {
+  if (!uiLocked.value) {
+    await store.dispatch("SAVE_PROJECT_FILE", {});
+  }
+};
+
+const importProject = () => {
+  if (!uiLocked.value) {
+    store.dispatch("LOAD_PROJECT_FILE", {});
+  }
+};
+
+// 「最近使ったプロジェクト」のメニュー
+const recentProjectsSubMenuData = ref<MenuItemData[]>([]);
+const updateRecentProjects = async () => {
+  const recentlyUsedProjects = await store.dispatch(
+    "GET_RECENTLY_USED_PROJECTS"
+  );
+  recentProjectsSubMenuData.value =
+    recentlyUsedProjects.length === 0
+      ? [
+          {
+            type: "button",
+            label: "最近使ったプロジェクトはありません",
+            onClick: () => {
+              // 何もしない
+            },
+            disabled: true,
+            disableWhenUiLocked: false,
+          },
+        ]
+      : recentlyUsedProjects.map((projectFilePath) => ({
+          type: "button",
+          label: projectFilePath,
+          onClick: () => {
+            store.dispatch("LOAD_PROJECT_FILE", {
+              filePath: projectFilePath,
+            });
+          },
+          disableWhenUiLocked: false,
+        }));
+};
+const projectFilePath = computed(() => store.state.projectFilePath);
+watch(projectFilePath, updateRecentProjects, {
+  immediate: true,
+});
+
+// 「ファイル」メニュー
+const fileSubMenuData = computed<MenuItemData[]>(() => [
+  {
+    type: "button",
+    label: "音声書き出し",
+    onClick: () => {
+      generateAndSaveAllAudio();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "選択音声を書き出し",
+    onClick: () => {
+      generateAndSaveSelectedAudio();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "音声を繋げて書き出し",
+    onClick: () => {
+      generateAndConnectAndSaveAllAudio();
+    },
+    disableWhenUiLocked: true,
+  },
+  { type: "separator" },
+  {
+    type: "button",
+    label: "テキストを繋げて書き出し",
+    onClick: () => {
+      connectAndExportText();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "テキスト読み込み",
+    onClick: () => {
+      importTextFile();
+    },
+    disableWhenUiLocked: true,
+  },
+  { type: "separator" },
+  {
+    type: "button",
+    label: "新規プロジェクト",
+    onClick: createNewProject,
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "プロジェクトを上書き保存",
+    onClick: async () => {
+      await saveProject();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "プロジェクトを名前を付けて保存",
+    onClick: async () => {
+      await saveProjectAs();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "button",
+    label: "プロジェクト読み込み",
+    onClick: () => {
+      importProject();
+    },
+    disableWhenUiLocked: true,
+  },
+  {
+    type: "root",
+    label: "最近使ったプロジェクト",
+    disableWhenUiLocked: true,
+    subMenu: recentProjectsSubMenuData.value,
+  },
+]);
+
+const hotkeyMap = new Map<HotkeyActionType, () => HotkeyReturnType>([
+  ["新規プロジェクト", createNewProject],
+  ["音声書き出し", generateAndSaveAllAudio],
+  ["選択音声を書き出し", generateAndSaveSelectedAudio],
+  ["音声を繋げて書き出し", generateAndConnectAndSaveAllAudio],
+  ["テキスト読み込む", importTextFile],
+  ["プロジェクトを上書き保存", saveProject],
+  ["プロジェクトを名前を付けて保存", saveProjectAs],
+  ["プロジェクト読み込み", importProject],
+]);
+
+setHotkeyFunctions(hotkeyMap);
+</script>
diff --git a/src/components/TitleBarButtons.vue b/src/components/TitleBarButtons.vue
index 057c6a8848..5911fb827d 100644
--- a/src/components/TitleBarButtons.vue
+++ b/src/components/TitleBarButtons.vue
@@ -111,7 +111,6 @@ const isPinned = computed(() => store.state.isPinned);
 }
 
 .title-bar-buttons {
-  -webkit-app-region: no-drag;
   overflow: visible;
 }
 </style>
diff --git a/src/components/TitleBarEditorSwitcher.vue b/src/components/TitleBarEditorSwitcher.vue
new file mode 100644
index 0000000000..0edec2ca3b
--- /dev/null
+++ b/src/components/TitleBarEditorSwitcher.vue
@@ -0,0 +1,56 @@
+<!--
+タイトルバーに配置される、エディタを切り替えるボタン
+-->
+
+<template>
+  <!-- FIXME: 画面サイズが小さくなると表示が崩れるのを直す -->
+  <!-- NOTE: デザインしづらいからQBtnかdivの方が良い -->
+  <q-btn-toggle
+    :model-value="nowEditor"
+    unelevated
+    dense
+    toggle-color="primary"
+    :options="[
+      { label: 'トーク', value: 'talk' },
+      { label: 'ソング', value: 'song' },
+    ]"
+    @update:model-value="gotoLink"
+  />
+</template>
+
+<script setup lang="ts">
+import { computed } from "vue";
+import { useRouter } from "vue-router";
+
+const router = useRouter();
+const nowEditor = computed<"talk" | "song">(() => {
+  const path = router.currentRoute.value.path;
+  if (path === "/talk") return "talk";
+  if (path === "/song") return "song";
+  window.electron.logWarn(`unknown path: ${path}`);
+  return "talk";
+});
+
+const gotoLink = (editor: "talk" | "song") => {
+  router.push("/" + editor);
+};
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+.q-btn-group {
+  :deep(.q-btn) {
+    padding-left: 0.75rem;
+    padding-right: 0.75rem;
+  }
+
+  // 選択されているボタンの文字を太字にする
+  :deep(.q-btn[aria-pressed="true"]) {
+    span {
+      font-weight: 700;
+      color: colors.$display-on-primary !important;
+    }
+  }
+}
+</style>
diff --git a/src/router/index.ts b/src/router/index.ts
index 7712e48b70..c1ebc2228b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -4,11 +4,11 @@ import EditorHome from "../views/EditorHome.vue";
 
 const routes: Array<RouteRecordRaw> = [
   {
-    path: "/home",
+    path: "/talk",
     component: EditorHome,
   },
   {
-    path: "/singer-home",
+    path: "/song",
     component: SingerHome,
   },
 ];
diff --git a/src/views/EditorHome.vue b/src/views/EditorHome.vue
index 889eb1d202..bc6342cbfb 100644
--- a/src/views/EditorHome.vue
+++ b/src/views/EditorHome.vue
@@ -1,5 +1,4 @@
 <template>
-  <singer-tab />
   <menu-bar />
 
   <q-layout reveal elevated container class="layout-container">
@@ -194,7 +193,7 @@ import HeaderBar from "@/components/HeaderBar.vue";
 import AudioCell from "@/components/AudioCell.vue";
 import AudioDetail from "@/components/AudioDetail.vue";
 import AudioInfo from "@/components/AudioInfo.vue";
-import MenuBar from "@/components/MenuBar.vue";
+import MenuBar from "@/components/Talk/MenuBar.vue";
 import HelpDialog from "@/components/help/HelpDialog.vue";
 import SettingDialog from "@/components/SettingDialog.vue";
 import HotkeySettingDialog from "@/components/HotkeySettingDialog.vue";
@@ -208,7 +207,6 @@ import DictionaryManageDialog from "@/components/DictionaryManageDialog.vue";
 import EngineManageDialog from "@/components/EngineManageDialog.vue";
 import ProgressDialog from "@/components/ProgressDialog.vue";
 import UpdateNotificationDialogContainer from "@/components/UpdateNotificationDialog/Container.vue";
-import SingerTab from "@/components/SingerTab.vue";
 import { AudioItem, EngineState } from "@/store/type";
 import {
   AudioKey,
@@ -543,13 +541,13 @@ onMounted(async () => {
   });
 });
 
-// ソフトウェアを初期化
+// エンジン初期化後の処理
 const isCompletedInitialStartup = ref(false);
 const unwatchIsEnginesReady = watch(
   // TODO: 最初に１度だけ実行している。Vueっぽくないので解体する
   () => props.isEnginesReady,
   async (isEnginesReady) => {
-    if (!isEnginesReady) throw new Error("isEnginesReady should be true");
+    if (!isEnginesReady) return;
 
     // プロジェクトファイルが指定されていればロード
     let projectFileLoaded = false;
@@ -589,6 +587,9 @@ const unwatchIsEnginesReady = watch(
     isCompletedInitialStartup.value = true;
 
     unwatchIsEnginesReady();
+  },
+  {
+    immediate: true,
   }
 );
 
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index 56bb1727c0..c40ad81338 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -1,5 +1,4 @@
 <template>
-  <singer-tab />
   <menu-bar />
   <tool-bar />
   <div class="sing-main">
@@ -26,7 +25,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted } from "vue";
+import { computed, defineComponent, onMounted, watch } from "vue";
 import { useStore } from "@/store";
 import {
   DEFAULT_BEATS,
@@ -34,7 +33,6 @@ import {
   DEFAULT_BPM,
   DEFAULT_TPQN,
 } from "@/sing/storeHelper";
-import SingerTab from "@/components/SingerTab.vue";
 import MenuBar from "@/components/Sing/MenuBar.vue";
 import ToolBar from "@/components/Sing/ToolBar.vue";
 import SingerPanel from "@/components/Sing/SingerPanel.vue";
@@ -43,14 +41,17 @@ import ScoreSequencer from "@/components/Sing/ScoreSequencer.vue";
 export default defineComponent({
   name: "SingerHome",
   components: {
-    SingerTab,
     MenuBar,
     ToolBar,
     SingerPanel,
     ScoreSequencer,
   },
+  props: {
+    projectFilePath: { type: String, default: undefined },
+    isEnginesReady: { type: Boolean, required: true },
+  },
 
-  setup() {
+  setup(props) {
     const store = useStore();
     //const $q = useQuasar();
 
@@ -86,7 +87,6 @@ export default defineComponent({
           notes: [],
         },
       });
-      await store.dispatch("SET_SINGER", {});
 
       await store.dispatch("SET_VOLUME", { volume: 0.6 });
       await store.dispatch("SET_PLAYHEAD_POSITION", { position: 0 });
@@ -99,6 +99,22 @@ export default defineComponent({
       return {};
     });
 
+    // エンジン初期化後の処理
+    const unwatchIsEnginesReady = watch(
+      // TODO: 最初に１度だけ実行している。Vueっぽくないので解体する
+      () => props.isEnginesReady,
+      async (isEnginesReady) => {
+        if (!isEnginesReady) return;
+
+        await store.dispatch("SET_SINGER", {});
+
+        unwatchIsEnginesReady();
+      },
+      {
+        immediate: true,
+      }
+    );
+
     return {
       nowRendering,
       nowAudioExporting,
diff --git "a/tests/e2e/browser/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210.spec.ts-snapshots/\343\203\241\343\202\244\343\203\263\347\224\273\351\235\242-browser-win32.png" "b/tests/e2e/browser/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210.spec.ts-snapshots/\343\203\241\343\202\244\343\203\263\347\224\273\351\235\242-browser-win32.png"
index 96794db997650f97453f710e6bf0b2da87171231..7ed89f66aaa410750b59d510142c5636c11ac8b5 100644
GIT binary patch
literal 48714
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

literal 47801
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

diff --git a/tests/e2e/navigators.ts b/tests/e2e/navigators.ts
index 1559538500..6fe1c9aeef 100644
--- a/tests/e2e/navigators.ts
+++ b/tests/e2e/navigators.ts
@@ -2,10 +2,10 @@ import { expect, Page } from "@playwright/test";
 import { getNewestQuasarDialog, getQuasarMenu } from "./locators";
 
 /**
- * /#/homeに移動
+ * /#/talkに移動
  */
 export async function gotoHome({ page }: { page: Page }) {
-  const BASE_URL = "http://localhost:7357/#/home";
+  const BASE_URL = "http://localhost:7357/#/talk";
   await page.setViewportSize({ width: 800, height: 600 });
   await page.goto(BASE_URL);
 }

From bf9f368ab832ecb1fe6fb86b7ade3fc369695a10 Mon Sep 17 00:00:00 2001
From: Romot <mail@romot.co>
Date: Thu, 25 Jan 2024 21:42:23 +0900
Subject: [PATCH 54/59] =?UTF-8?q?[project-s]=20=E3=82=AD=E3=83=A3=E3=83=A9?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=BC=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=81=8A=E3=82=88=E3=81=B3=E5=85=A8=E8=BA=AB=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=83=AC=E3=83=BC=E3=83=88=E8=A1=A8=E7=A4=BA=20(#1750?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* #1696 キャラクターメニュー変更および全身表示

* #1696 表示調整

---------

Co-authored-by: Romot <romot@romotmbp16.local>
---
 src/components/Sing/CharacterPortrait.vue |  67 ++++++++++++
 src/components/Sing/ScoreSequencer.vue    |   4 +
 src/components/Sing/SingerPanel.vue       | 112 -------------------
 src/components/Sing/ToolBar.vue           | 126 ++++++++++++++--------
 src/views/SingerHome.vue                  |   3 -
 5 files changed, 155 insertions(+), 157 deletions(-)
 create mode 100644 src/components/Sing/CharacterPortrait.vue
 delete mode 100644 src/components/Sing/SingerPanel.vue

diff --git a/src/components/Sing/CharacterPortrait.vue b/src/components/Sing/CharacterPortrait.vue
new file mode 100644
index 0000000000..af85d99ba3
--- /dev/null
+++ b/src/components/Sing/CharacterPortrait.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="character-portrait-wrap" :class="{ hide: !isShowSinger }">
+    <img class="character-portrait" :src="portraitPath" />
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from "vue";
+import { useStore } from "@/store";
+
+export default defineComponent({
+  name: "CharacterPortrait",
+  setup() {
+    const store = useStore();
+    const isShowSinger = computed(() => store.state.isShowSinger);
+
+    const userOrderedCharacterInfos = computed(
+      () => store.getters.USER_ORDERED_CHARACTER_INFOS
+    );
+
+    const characterInfo = computed(() => {
+      if (!userOrderedCharacterInfos.value || !store.state.singer) {
+        return undefined;
+      }
+      return store.getters.CHARACTER_INFO(
+        store.state.singer.engineId,
+        store.state.singer.styleId
+      );
+    });
+
+    const portraitPath = computed(() => characterInfo.value?.portraitPath);
+
+    return {
+      isShowSinger,
+      userOrderedCharacterInfos,
+      characterInfo,
+      portraitPath,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss">
+@use '@/styles/variables' as vars;
+@use '@/styles/colors' as colors;
+
+// 画面右下に固定表示
+// 幅固定、高さ可変、画像のアスペクト比を保持、wrapのwidthに合わせてheightを調整
+// bottom位置はスクロールバーの上に表示
+.character-portrait-wrap {
+  opacity: 0.55;
+  overflow: hidden;
+  contain: layout;
+  pointer-events: none;
+  position: fixed;
+  bottom: 0;
+  right: 88px;
+  min-width: 200px;
+  max-width: 20vw;
+}
+
+.character-portrait {
+  width: 100%;
+  height: auto;
+  backface-visibility: hidden;
+}
+</style>
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 5a45daa335..7bda29d0c0 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -27,6 +27,8 @@
       @wheel="onWheel"
       @scroll="onScroll"
     >
+      <!-- キャラクター全身 -->
+      <character-portrait />
       <!-- グリッド -->
       <!-- NOTE: 現状オクターブごとの罫線なし -->
       <svg
@@ -210,6 +212,7 @@ import SequencerRuler from "@/components/Sing/SequencerRuler.vue";
 import SequencerKeys from "@/components/Sing/SequencerKeys.vue";
 import SequencerNote from "@/components/Sing/SequencerNote.vue";
 import SequencerPhraseIndicator from "@/components/Sing/SequencerPhraseIndicator.vue";
+import CharacterPortrait from "@/components/Sing/CharacterPortrait.vue";
 
 type PreviewMode = "ADD" | "MOVE" | "RESIZE_RIGHT" | "RESIZE_LEFT";
 
@@ -225,6 +228,7 @@ export default defineComponent({
     SequencerKeys,
     SequencerNote,
     SequencerPhraseIndicator,
+    CharacterPortrait,
   },
   setup() {
     const store = useStore();
diff --git a/src/components/Sing/SingerPanel.vue b/src/components/Sing/SingerPanel.vue
deleted file mode 100644
index 0065c746c9..0000000000
--- a/src/components/Sing/SingerPanel.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-  <div class="sing-singer-panel" :class="{ hide: !isShowSinger }">
-    <character-menu-button class="character-menu-button" :disable="uiLocked">
-      <span class="character-name">{{ characterName }}</span>
-      <div class="character-portrait-wrapper">
-        <img class="character-portrait" :src="portraitPath" />
-      </div>
-    </character-menu-button>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, computed } from "vue";
-import { useStore } from "@/store";
-import CharacterMenuButton from "@/components/Sing/CharacterMenuButton.vue";
-
-export default defineComponent({
-  name: "SingSingerPanel",
-  components: {
-    CharacterMenuButton,
-  },
-
-  setup() {
-    const store = useStore();
-    const isShowSinger = computed(() => store.state.isShowSinger);
-
-    const uiLocked = computed(() => store.getters.UI_LOCKED);
-
-    const userOrderedCharacterInfos = computed(
-      () => store.getters.USER_ORDERED_CHARACTER_INFOS
-    );
-
-    const characterInfo = computed(() => {
-      if (!userOrderedCharacterInfos.value || !store.state.singer) {
-        return undefined;
-      }
-      return store.getters.CHARACTER_INFO(
-        store.state.singer.engineId,
-        store.state.singer.styleId
-      );
-    });
-
-    const characterName = computed(() => {
-      const style = characterInfo.value?.metas.styles.find(
-        (style) => style.styleId === store.state.singer?.styleId
-      );
-      return style?.styleName
-        ? `${characterInfo.value?.metas.speakerName} (${style?.styleName})`
-        : characterInfo.value?.metas.speakerName;
-    });
-
-    const portraitPath = computed(() => characterInfo.value?.portraitPath);
-
-    return {
-      isShowSinger,
-      uiLocked,
-      userOrderedCharacterInfos,
-      characterInfo,
-      characterName,
-      portraitPath,
-    };
-  },
-});
-</script>
-
-<style scoped lang="scss">
-@use '@/styles/variables' as vars;
-@use '@/styles/colors' as colors;
-
-.character-name {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  padding: 1px 24px 1px 8px;
-  background-image: linear-gradient(
-    90deg,
-    rgba(colors.$background-rgb, 0.5) 0%,
-    rgba(colors.$background-rgb, 0.5) 75%,
-    transparent 100%
-  );
-  overflow-wrap: anywhere;
-}
-
-.sing-singer-panel {
-  background: colors.$background;
-  border-right: 1px solid #ccc;
-  width: 200px;
-
-  &.hide {
-    display: none;
-  }
-}
-
-.character-portrait-wrapper {
-  display: grid;
-  justify-content: center;
-
-  .character-portrait {
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-
-.character-menu-button {
-  height: 168px;
-  width: 100%;
-  border-bottom: 1px solid #ccc;
-  box-shadow: 0px -2px 4px -3px #ccc inset;
-  overflow: hidden;
-  border-radius: 0px;
-}
-</style>
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 6b20e1ce89..6fb1c1de46 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -1,12 +1,29 @@
 <template>
   <div class="sing-toolbar">
-    <div
-      class="singer-panel-toggler"
-      :class="{ active: isShowSinger }"
-      @click="toggleShowSinger"
-    >
-      <img :src="selectedStyleIconPath" class="singer-avatar" />
-    </div>
+    <character-menu-button>
+      <div class="character-menu-toggle">
+        <q-avatar
+          v-if="selectedStyleIconPath"
+          class="character-avatar"
+          size="3.5rem"
+        >
+          <img :src="selectedStyleIconPath" class="character-avatar-icon" />
+        </q-avatar>
+        <div class="character-info">
+          <div class="character-name">
+            {{ selectedCharacterName }}
+          </div>
+          <div class="character-style">
+            {{ selectedCharacterStyle }}
+          </div>
+        </div>
+        <q-icon
+          name="arrow_drop_down"
+          size="sm"
+          class="character-menu-dropdown-icon"
+        />
+      </div>
+    </character-menu-button>
     <div class="sing-player">
       <q-btn
         flat
@@ -106,18 +123,17 @@ import {
   isValidBeats,
   isValidBpm,
 } from "@/sing/domain";
+import CharacterMenuButton from "@/components/Sing/CharacterMenuButton.vue";
 
 export default defineComponent({
   name: "SingToolBar",
-
+  components: {
+    CharacterMenuButton,
+  },
   setup() {
     const store = useStore();
-    const isShowSinger = computed(() => store.state.isShowSinger);
-    const toggleShowSinger = () => {
-      store.dispatch("SET_SHOW_SINGER", {
-        isShowSinger: !isShowSinger.value,
-      });
-    };
+
+    const uiLocked = computed(() => store.getters.UI_LOCKED);
 
     const userOrderedCharacterInfos = computed(
       () => store.getters.USER_ORDERED_CHARACTER_INFOS
@@ -131,6 +147,17 @@ export default defineComponent({
         store.state.singer.styleId
       );
     });
+    const selectedCharacterName = computed(() => {
+      return selectedCharacterInfo.value?.metas.speakerName;
+    });
+    const selectedCharacterStyle = computed(() => {
+      return selectedCharacterInfo.value?.metas.styles.find((style) => {
+        return (
+          style.styleId === store.state.singer?.styleId &&
+          style.engineId === store.state.singer?.engineId
+        );
+      })?.styleName;
+    });
     const selectedStyleIconPath = computed(() => {
       const styles = selectedCharacterInfo.value?.metas.styles;
       return styles?.find((style) => {
@@ -299,8 +326,9 @@ export default defineComponent({
     });
 
     return {
-      isShowSinger,
-      toggleShowSinger,
+      uiLocked,
+      selectedCharacterName,
+      selectedCharacterStyle,
       selectedStyleIconPath,
       bpmInputBuffer,
       beatsInputBuffer,
@@ -327,38 +355,53 @@ export default defineComponent({
 @use '@/styles/variables' as vars;
 @use '@/styles/colors' as colors;
 
-.sing-toolbar {
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
+.character-menu-toggle {
   align-items: center;
   display: flex;
-  padding: 8px 16px;
+  padding: 0.25rem 0.5rem 0.25rem 0.25rem;
+  position: relative;
+}
+.character-avatar-icon {
+  display: block;
+  height: 100%;
+  object-fit: cover;
   width: 100%;
 }
 
-.singer-panel-toggler {
-  border: 2px solid #bbb;
-  border-radius: 50%;
-  display: block;
-  height: 48px;
-  margin-right: auto;
-  overflow: hidden;
-  width: 48px;
-
-  &:hover {
-    cursor: pointer;
-  }
-
-  &.active {
-    border-color: colors.$primary;
-  }
+.character-info {
+  align-items: start;
+  display: flex;
+  flex-direction: column;
+  margin-left: 0.5rem;
+  text-align: left;
+  justify-content: center;
+  white-space: nowrap;
+}
+.character-name {
+  font-size: 0.875rem;
+  font-weight: bold;
+  line-height: 1rem;
+  padding-top: 0.5rem;
 }
 
-.singer-avatar {
-  background: colors.$background;
-  display: block;
-  object-fit: cover;
-  height: 100%;
+.character-style {
+  color: #999;
+  font-size: 0.75rem;
+  font-weight: bold;
+  line-height: 1rem;
+}
+
+.character-menu-dropdown-icon {
+  color: rgba(0, 0, 0, 0.54);
+  margin-left: 0.25rem;
+}
+.sing-toolbar {
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 16px 0 0;
   width: 100%;
 }
 
@@ -396,7 +439,6 @@ export default defineComponent({
 .sing-setting {
   align-items: center;
   display: flex;
-  margin-left: auto;
 }
 
 .sing-volume {
diff --git a/src/views/SingerHome.vue b/src/views/SingerHome.vue
index c40ad81338..42f35152a0 100644
--- a/src/views/SingerHome.vue
+++ b/src/views/SingerHome.vue
@@ -19,7 +19,6 @@
         />
       </div>
     </div>
-    <singer-panel />
     <score-sequencer />
   </div>
 </template>
@@ -35,7 +34,6 @@ import {
 } from "@/sing/storeHelper";
 import MenuBar from "@/components/Sing/MenuBar.vue";
 import ToolBar from "@/components/Sing/ToolBar.vue";
-import SingerPanel from "@/components/Sing/SingerPanel.vue";
 import ScoreSequencer from "@/components/Sing/ScoreSequencer.vue";
 
 export default defineComponent({
@@ -43,7 +41,6 @@ export default defineComponent({
   components: {
     MenuBar,
     ToolBar,
-    SingerPanel,
     ScoreSequencer,
   },
   props: {

From b46d8568e67d4d422e5500e8456ac43e86b8008c Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sat, 27 Jan 2024 06:31:30 +0900
Subject: [PATCH 55/59] =?UTF-8?q?[project-s]=20=E3=82=AD=E3=83=A3=E3=83=A9?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=BC=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E8=AA=BF=E6=95=B4=20(#1764)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* キャラクターメニューを調整

* 修正
---
 src/components/Sing/CharacterMenuButton.vue | 53 +++++++++++++--------
 src/components/Sing/ToolBar.vue             | 12 +++--
 src/sing/viewHelper.ts                      | 19 ++++++++
 src/store/audio.ts                          |  1 +
 src/type/preload.ts                         |  3 ++
 5 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/src/components/Sing/CharacterMenuButton.vue b/src/components/Sing/CharacterMenuButton.vue
index 9e7cda25b0..bcbe628382 100644
--- a/src/components/Sing/CharacterMenuButton.vue
+++ b/src/components/Sing/CharacterMenuButton.vue
@@ -1,6 +1,6 @@
 <template>
   <q-btn flat class="q-pa-none">
-    <slot />
+    <slot></slot>
     <q-menu
       class="character-menu"
       transition-show="none"
@@ -86,7 +86,9 @@
                 >
                   <q-list>
                     <q-item
-                      v-for="(style, styleIndex) in characterInfo.metas.styles"
+                      v-for="(style, styleIndex) in getSingingStyles(
+                        characterInfo
+                      )"
                       :key="styleIndex"
                       v-close-popup
                       clickable
@@ -104,27 +106,21 @@
                           no-spinner
                           no-transition
                           :ratio="1"
-                          :src="characterInfo.metas.styles[styleIndex].iconPath"
+                          :src="style.iconPath"
                         />
                         <q-avatar
                           v-if="isMultipleEngine"
                           rounded
                           class="engine-icon"
                         >
-                          <img
-                            :src="
-                              engineIcons[
-                                characterInfo.metas.styles[styleIndex].engineId
-                              ]
-                            "
-                          />
+                          <img :src="engineIcons[style.engineId]" />
                         </q-avatar>
                       </q-avatar>
-                      <q-item-section v-if="style.styleName"
-                        >{{ characterInfo.metas.speakerName }} ({{
-                          style.styleName
-                        }})</q-item-section
-                      >
+                      <q-item-section v-if="style.styleName">
+                        {{ characterInfo.metas.speakerName }} ({{
+                          getStyleDescription(style)
+                        }})
+                      </q-item-section>
                       <q-item-section v-else>{{
                         characterInfo.metas.speakerName
                       }}</q-item-section>
@@ -145,7 +141,8 @@ import { defineComponent, computed, ref } from "vue";
 import { debounce } from "quasar";
 import { useStore } from "@/store";
 import { base64ImageToUri } from "@/helpers/imageHelper";
-import { SpeakerId, StyleId } from "@/type/preload";
+import { CharacterInfo, SpeakerId, StyleId, StyleInfo } from "@/type/preload";
+import { getStyleDescription } from "@/sing/viewHelper";
 
 export default defineComponent({
   name: "CharacterMenuButton",
@@ -153,9 +150,19 @@ export default defineComponent({
   setup() {
     const store = useStore();
 
-    const userOrderedCharacterInfos = computed(
-      () => store.getters.USER_ORDERED_CHARACTER_INFOS
-    );
+    const isSingingStyle = (styleInfo: StyleInfo) => {
+      return (
+        styleInfo.styleType === "humming" ||
+        styleInfo.styleType === "sing_teacher"
+      );
+    };
+
+    const userOrderedCharacterInfos = computed(() => {
+      return store.getters.USER_ORDERED_CHARACTER_INFOS?.filter(
+        (characterInfo) =>
+          characterInfo.metas.styles.some((value) => isSingingStyle(value))
+      );
+    });
 
     const subMenuOpenFlags = ref(
       [...Array(userOrderedCharacterInfos.value?.length)].map(() => false)
@@ -207,6 +214,12 @@ export default defineComponent({
       return defaultStyle;
     };
 
+    const getSingingStyles = (characterInfo: CharacterInfo) => {
+      return characterInfo.metas.styles.filter((value) =>
+        isSingingStyle(value)
+      );
+    };
+
     const selectedCharacterInfo = computed(() => {
       if (
         userOrderedCharacterInfos.value == undefined ||
@@ -250,6 +263,8 @@ export default defineComponent({
       reassignSubMenuOpen,
       changeStyleId,
       getDefaultStyle,
+      getSingingStyles,
+      getStyleDescription,
       selectedCharacterInfo,
       selectedSpeakerUuid,
       selectedStyleId,
diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
index 6fb1c1de46..9523f1f314 100644
--- a/src/components/Sing/ToolBar.vue
+++ b/src/components/Sing/ToolBar.vue
@@ -14,7 +14,7 @@
             {{ selectedCharacterName }}
           </div>
           <div class="character-style">
-            {{ selectedCharacterStyle }}
+            {{ selectedCharacterStyleDescription }}
           </div>
         </div>
         <q-icon
@@ -124,6 +124,7 @@ import {
   isValidBpm,
 } from "@/sing/domain";
 import CharacterMenuButton from "@/components/Sing/CharacterMenuButton.vue";
+import { getStyleDescription } from "@/sing/viewHelper";
 
 export default defineComponent({
   name: "SingToolBar",
@@ -150,13 +151,14 @@ export default defineComponent({
     const selectedCharacterName = computed(() => {
       return selectedCharacterInfo.value?.metas.speakerName;
     });
-    const selectedCharacterStyle = computed(() => {
-      return selectedCharacterInfo.value?.metas.styles.find((style) => {
+    const selectedCharacterStyleDescription = computed(() => {
+      const style = selectedCharacterInfo.value?.metas.styles.find((style) => {
         return (
           style.styleId === store.state.singer?.styleId &&
           style.engineId === store.state.singer?.engineId
         );
-      })?.styleName;
+      });
+      return style != undefined ? getStyleDescription(style) : "";
     });
     const selectedStyleIconPath = computed(() => {
       const styles = selectedCharacterInfo.value?.metas.styles;
@@ -328,7 +330,7 @@ export default defineComponent({
     return {
       uiLocked,
       selectedCharacterName,
-      selectedCharacterStyle,
+      selectedCharacterStyleDescription,
       selectedStyleIconPath,
       bpmInputBuffer,
       beatsInputBuffer,
diff --git a/src/sing/viewHelper.ts b/src/sing/viewHelper.ts
index 4787dcc881..efc31401fb 100644
--- a/src/sing/viewHelper.ts
+++ b/src/sing/viewHelper.ts
@@ -1,3 +1,5 @@
+import { StyleInfo } from "@/type/preload";
+
 const BASE_X_PER_QUARTER_NOTE = 120;
 const BASE_Y_PER_SEMITONE = 30;
 
@@ -97,3 +99,20 @@ export const keyInfos = [...Array(128)]
     };
   })
   .reverse();
+
+export const getStyleDescription = (style: StyleInfo) => {
+  const description: string[] = [];
+  if (style.styleType === "talk") {
+    description.push("トーク");
+  } else if (style.styleType === "humming") {
+    description.push("ハミング");
+  } else if (style.styleType === "sing_teacher") {
+    description.push("歌");
+  } else {
+    throw new Error("Unknown style type.");
+  }
+  if (style.styleName != undefined) {
+    description.push(style.styleName);
+  }
+  return description.join("・");
+};
diff --git a/src/store/audio.ts b/src/store/audio.ts
index f8ae7d7b0c..b5676a25b2 100644
--- a/src/store/audio.ts
+++ b/src/store/audio.ts
@@ -335,6 +335,7 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
           styles[i] = {
             styleName: style.name,
             styleId: StyleId(style.id),
+            styleType: style.type,
             engineId,
             iconPath: base64ImageToUri(styleInfo.icon),
             portraitPath:
diff --git a/src/type/preload.ts b/src/type/preload.ts
index 2c9ebb84c3..f1c10af1ac 100644
--- a/src/type/preload.ts
+++ b/src/type/preload.ts
@@ -253,9 +253,12 @@ export type AppInfos = {
   version: string;
 };
 
+export type StyleType = "talk" | "humming" | "sing_teacher";
+
 export type StyleInfo = {
   styleName?: string;
   styleId: StyleId;
+  styleType?: StyleType;
   iconPath: string;
   portraitPath: string | undefined;
   engineId: EngineId;

From a804e47e988de53a748228ca20dc24a9c9d2df77 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Sun, 28 Jan 2024 10:09:37 +0900
Subject: [PATCH 56/59] =?UTF-8?q?[project-s]=20=E3=82=B7=E3=83=BC=E3=82=B1?=
 =?UTF-8?q?=E3=83=B3=E3=82=B5=E3=83=BC=E3=81=AE=E3=82=B9=E3=82=AF=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=BB=E7=B7=A8=E9=9B=86=E5=91=A8=E3=82=8A?=
 =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4=20(#1767)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* トーク・ソング切り替えでスクロール位置が変わらないようにする

* ノート追加のプレビュー（ノートの長さを設定）ではカーソル位置ではなくドラッグ量で判定を行うように変更

* シンセの音を調整

* firstActivation移動

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/components/Sing/ScoreSequencer.vue | 67 +++++++++++++++++---------
 src/infrastructures/AudioRenderer.ts   |  8 +--
 src/sing/viewHelper.ts                 |  2 +-
 3 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 7bda29d0c0..972f1c5858 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -183,7 +183,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref, onMounted, onUnmounted } from "vue";
+import {
+  defineComponent,
+  computed,
+  ref,
+  onActivated,
+  onDeactivated,
+  nextTick,
+} from "vue";
 import { v4 as uuidv4 } from "uuid";
 import { useStore } from "@/store";
 import { Note } from "@/store/type";
@@ -355,10 +362,10 @@ export default defineComponent({
       if (!draggingNote) {
         throw new Error("draggingNote is undefined.");
       }
-      const noteEndPos = draggingNote.position + draggingNote.duration;
-      const newNoteEndPos =
-        Math.round(cursorTicks / snapTicks.value) * snapTicks.value;
-      const movingTicks = newNoteEndPos - noteEndPos;
+      const dragTicks = cursorTicks - dragStartTicks;
+      const noteDuration =
+        Math.round(dragTicks / snapTicks.value) * snapTicks.value;
+      const noteEndPos = draggingNote.position + noteDuration;
 
       const editedNotes = new Map<string, Note>();
       for (const note of previewNotes.value) {
@@ -366,12 +373,7 @@ export default defineComponent({
         if (!copiedNote) {
           throw new Error("copiedNote is undefined.");
         }
-        const notePos = copiedNote.position;
-        const noteEndPos = copiedNote.position + copiedNote.duration;
-        const duration = Math.max(
-          snapTicks.value,
-          noteEndPos + movingTicks - notePos
-        );
+        const duration = Math.max(snapTicks.value, noteDuration);
         if (note.duration !== duration) {
           editedNotes.set(note.id, { ...note, duration });
         }
@@ -382,7 +384,7 @@ export default defineComponent({
         });
       }
 
-      const guideLineBaseX = tickToBaseX(newNoteEndPos, tpqn.value);
+      const guideLineBaseX = tickToBaseX(noteEndPos, tpqn.value);
       guideLineX.value = guideLineBaseX * zoomX.value;
     };
 
@@ -992,22 +994,39 @@ export default defineComponent({
       }
     };
 
-    onMounted(() => {
+    // 最初のonActivatedか判断するためのフラグ
+    let firstActivation = true;
+    onActivated(() => {
       const sequencerBodyElement = sequencerBody.value;
       if (!sequencerBodyElement) {
         throw new Error("sequencerBodyElement is null.");
       }
-      // 上から2/3の位置がC4になるようにスクロールする
-      const clientHeight = sequencerBodyElement.clientHeight;
-      const c4BaseY = noteNumberToBaseY(60);
-      const clientBaseHeight = clientHeight / zoomY.value;
-      const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
-      sequencerBodyElement.scrollTo(0, scrollBaseY * zoomY.value);
 
-      // スクロールバーの幅を取得する
-      const clientWidth = sequencerBodyElement.clientWidth;
-      const offsetWidth = sequencerBodyElement.offsetWidth;
-      scrollBarWidth.value = offsetWidth - clientWidth;
+      let xToScroll = 0;
+      let yToScroll = 0;
+      if (firstActivation) {
+        // スクロール位置を設定（C4が上から2/3の位置になるようにする）
+        const clientHeight = sequencerBodyElement.clientHeight;
+        const c4BaseY = noteNumberToBaseY(60);
+        const clientBaseHeight = clientHeight / zoomY.value;
+        const scrollBaseY = c4BaseY - clientBaseHeight * (2 / 3);
+        xToScroll = 0;
+        yToScroll = scrollBaseY * zoomY.value;
+
+        // スクロールバーの幅を取得する
+        const clientWidth = sequencerBodyElement.clientWidth;
+        const offsetWidth = sequencerBodyElement.offsetWidth;
+        scrollBarWidth.value = offsetWidth - clientWidth;
+
+        firstActivation = false;
+      } else {
+        xToScroll = scrollX.value;
+        yToScroll = scrollY.value;
+      }
+      // 実際にスクロールする
+      nextTick().then(() => {
+        sequencerBodyElement.scrollTo(xToScroll, yToScroll);
+      });
 
       store.dispatch("ADD_PLAYHEAD_POSITION_CHANGE_LISTENER", {
         listener: playheadPositionChangeListener,
@@ -1016,7 +1035,7 @@ export default defineComponent({
       document.addEventListener("keydown", handleKeydown);
     });
 
-    onUnmounted(() => {
+    onDeactivated(() => {
       store.dispatch("REMOVE_PLAYHEAD_POSITION_CHANGE_LISTENER", {
         listener: playheadPositionChangeListener,
       });
diff --git a/src/infrastructures/AudioRenderer.ts b/src/infrastructures/AudioRenderer.ts
index adc53bd423..0f8ac14409 100644
--- a/src/infrastructures/AudioRenderer.ts
+++ b/src/infrastructures/AudioRenderer.ts
@@ -784,19 +784,19 @@ export class PolySynth implements Instrument {
       type: "square",
     };
     this.filterParams = options?.filter ?? {
-      cutoff: 3000,
+      cutoff: 2500,
       resonance: 0,
-      keyTrack: 0.26,
+      keyTrack: 0.25,
     };
     this.ampParams = options?.amp ?? {
       attack: 0.001,
       decay: 0.18,
-      sustain: 0.4,
+      sustain: 0.5,
       release: 0.02,
     };
 
     this.gainNode = new GainNode(this.audioContext);
-    this.gainNode.gain.value = options?.volume ?? 0.11;
+    this.gainNode.gain.value = options?.volume ?? 0.1;
   }
 
   /**
diff --git a/src/sing/viewHelper.ts b/src/sing/viewHelper.ts
index efc31401fb..b484d7c943 100644
--- a/src/sing/viewHelper.ts
+++ b/src/sing/viewHelper.ts
@@ -9,7 +9,7 @@ export const ZOOM_X_STEP = 0.05;
 export const ZOOM_Y_MIN = 0.35;
 export const ZOOM_Y_MAX = 1;
 export const ZOOM_Y_STEP = 0.05;
-export const PREVIEW_SOUND_DURATION = 0.1;
+export const PREVIEW_SOUND_DURATION = 0.15;
 
 export function getKeyBaseHeight() {
   return BASE_Y_PER_SEMITONE;

From 55a497cc6613c980ae48df01ac9ad660b7f9864f Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Sun, 28 Jan 2024 23:47:19 +0900
Subject: [PATCH 57/59] =?UTF-8?q?[project-s]=20Openapi=E3=82=920.16.0-dev?=
 =?UTF-8?q?=E7=94=A8=E3=81=AB=E6=9B=B4=E6=96=B0=20(#1769)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* openapiを0.16.0-dev用に更新

* latestに変更

* Revert "latestに変更"

This reverts commit fe32aecc6e2b936170b3aebbd097da02226f8760.

* latestに

* ,

* fmtの謎

* add v
---
 openapi.json                       |  2 +-
 src/openapi/apis/DefaultApi.ts     | 28 ++++++++++++----------------
 src/openapi/models/SpeakerStyle.ts |  3 ++-
 src/store/singing.ts               |  4 ++--
 src/type/preload.ts                |  2 +-
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/openapi.json b/openapi.json
index f50575a346..a77ee03da0 100644
--- a/openapi.json
+++ b/openapi.json
@@ -1 +1 @@
-{"openapi":"3.1.0","info":{"title":"VOICEVOX Engine","description":"VOICEVOXの音声合成エンジンです。","version":"latest"},"paths":{"/audio_query":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリを作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_audio_query_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/audio_query_from_preset":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリをプリセットを用いて作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_from_preset_audio_query_from_preset_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":true,"schema":{"type":"integer","title":"Preset Id"},"name":"preset_id","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/accent_phrases":{"post":{"tags":["クエリ編集"],"summary":"テキストからアクセント句を得る","description":"テキストからアクセント句を得ます。\nis_kanaが`true`のとき、テキストは次のAquesTalk 風記法で解釈されます。デフォルトは`false`です。\n* 全てのカナはカタカナで記述される\n* アクセント句は`/`または`、`で区切る。`、`で区切った場合に限り無音区間が挿入される。\n* カナの手前に`_`を入れるとそのカナは無声化される\n* アクセント位置を`'`で指定する。全てのアクセント句にはアクセント位置を1つ指定する必要がある。\n* アクセント句末に`？`(全角)を入れることにより疑問文の発音ができる。","operationId":"accent_phrases_accent_phrases_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"boolean","title":"Is Kana","default":false},"name":"is_kana","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Accent Phrases Accent Phrases Post"}}}},"400":{"description":"読み仮名のパースに失敗","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_data":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高・音素長を得る","operationId":"mora_data_mora_data_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Data Mora Data Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_length":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音素長を得る","operationId":"mora_length_mora_length_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Length Mora Length Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_pitch":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高を得る","operationId":"mora_pitch_mora_pitch_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Pitch Mora Pitch Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する","operationId":"synthesis_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"疑問系のテキストが与えられたら語尾を自動調整する","required":false,"schema":{"type":"boolean","title":"Enable Interrogative Upspeak","description":"疑問系のテキストが与えられたら語尾を自動調整する","default":true},"name":"enable_interrogative_upspeak","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/cancellable_synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する（キャンセル可能）","operationId":"cancellable_synthesis_cancellable_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/multi_synthesis":{"post":{"tags":["音声合成"],"summary":"複数まとめて音声合成する","operationId":"multi_synthesis_multi_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AudioQuery"},"type":"array","title":"Queries"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/zip":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/morphable_targets":{"post":{"tags":["音声合成"],"summary":"指定したスタイルに対してエンジン内の話者がモーフィングが可能か判定する","description":"指定されたベーススタイルに対してエンジン内の各話者がモーフィング機能を利用可能か返します。\nモーフィングの許可/禁止は`/speakers`の`speaker.supported_features.synthesis_morphing`に記載されています。\nプロパティが存在しない場合は、モーフィングが許可されているとみなします。\n返り値の話者はstring型なので注意。","operationId":"morphable_targets_morphable_targets_post","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"type":"integer"},"type":"array","title":"Base Style Ids"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"additionalProperties":{"$ref":"#/components/schemas/MorphableTargetInfo"},"type":"object"},"type":"array","title":"Response Morphable Targets Morphable Targets Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis_morphing":{"post":{"tags":["音声合成"],"summary":"2種類のスタイルでモーフィングした音声を合成する","description":"指定された2種類のスタイルで音声を合成、指定した割合でモーフィングした音声を得ます。\nモーフィングの割合は`morph_rate`で指定でき、0.0でベースのスタイル、1.0でターゲットのスタイルに近づきます。","operationId":"_synthesis_morphing_synthesis_morphing_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Base Style Id"},"name":"base_style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Base Speaker"},"name":"base_speaker","in":"query"},{"required":false,"schema":{"type":"integer","title":"Target Style Id"},"name":"target_style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Target Speaker"},"name":"target_speaker","in":"query"},{"required":true,"schema":{"type":"number","maximum":1.0,"minimum":0.0,"title":"Morph Rate"},"name":"morph_rate","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/sing_frame_audio_query":{"post":{"tags":["クエリ作成"],"summary":"歌唱音声合成用のクエリを作成する","description":"歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"sing_frame_audio_query_sing_frame_audio_query_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Score"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/FrameAudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/frame_synthesis":{"post":{"tags":["音声合成"],"summary":"Frame Synthesis","description":"歌唱音声合成を行います。","operationId":"frame_synthesis_frame_synthesis_post","parameters":[{"required":false,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"deprecated":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/FrameAudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/connect_waves":{"post":{"tags":["その他"],"summary":"base64エンコードされた複数のwavデータを一つに結合する","description":"base64エンコードされたwavデータを一纏めにし、wavファイルで返します。","operationId":"connect_waves_connect_waves_post","requestBody":{"content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Waves"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/presets":{"get":{"tags":["その他"],"summary":"Get Presets","description":"エンジンが保持しているプリセットの設定を返します\n\nReturns\n-------\npresets: list[Preset]\n    プリセットのリスト","operationId":"get_presets_presets_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Preset"},"type":"array","title":"Response Get Presets Presets Get"}}}}}}},"/add_preset":{"post":{"tags":["その他"],"summary":"Add Preset","description":"新しいプリセットを追加します\n\nParameters\n-------\npreset: Preset\n    新しいプリセット。\n    プリセットIDが既存のものと重複している場合は、新規のプリセットIDが採番されます。\n\nReturns\n-------\nid: int\n    追加したプリセットのプリセットID","operationId":"add_preset_add_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Add Preset Add Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/update_preset":{"post":{"tags":["その他"],"summary":"Update Preset","description":"既存のプリセットを更新します\n\nParameters\n-------\npreset: Preset\n    更新するプリセット。\n    プリセットIDが更新対象と一致している必要があります。\n\nReturns\n-------\nid: int\n    更新したプリセットのプリセットID","operationId":"update_preset_update_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Update Preset Update Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/delete_preset":{"post":{"tags":["その他"],"summary":"Delete Preset","description":"既存のプリセットを削除します\n\nParameters\n-------\nid: int\n    削除するプリセットのプリセットID","operationId":"delete_preset_delete_preset_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Id"},"name":"id","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/version":{"get":{"tags":["その他"],"summary":"Version","operationId":"version_version_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Version Version Get"}}}}}}},"/core_versions":{"get":{"tags":["その他"],"summary":"Core Versions","operationId":"core_versions_core_versions_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Response Core Versions Core Versions Get"}}}}}}},"/speakers":{"get":{"tags":["その他"],"summary":"Speakers","operationId":"speakers_speakers_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Speaker"},"type":"array","title":"Response Speakers Speakers Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/speaker_info":{"get":{"tags":["その他"],"summary":"Speaker Info","description":"指定されたspeaker_uuidに関する情報をjson形式で返します。\n画像や音声はbase64エンコードされたものが返されます。\n\nReturns\n-------\nret_data: SpeakerInfo","operationId":"speaker_info_speaker_info_get","parameters":[{"required":true,"schema":{"type":"string","title":"Speaker Uuid"},"name":"speaker_uuid","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SpeakerInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/downloadable_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Downloadable Libraries","description":"ダウンロード可能な音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: list[DownloadableLibrary]","operationId":"downloadable_libraries_downloadable_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/DownloadableLibraryInfo"},"type":"array","title":"Response Downloadable Libraries Downloadable Libraries Get"}}}}}}},"/installed_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Installed Libraries","description":"インストールした音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: dict[str, InstalledLibrary]","operationId":"installed_libraries_installed_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/InstalledLibraryInfo"},"type":"object","title":"Response Installed Libraries Installed Libraries Get"}}}}}}},"/install_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Install Library","description":"音声ライブラリをインストールします。\n音声ライブラリのZIPファイルをリクエストボディとして送信してください。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"install_library_install_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/uninstall_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Uninstall Library","description":"音声ライブラリをアンインストールします。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"uninstall_library_uninstall_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_style_id":{"post":{"tags":["その他"],"summary":"Initialize Style Id","description":"指定されたstyle_idのスタイルを初期化します。\n実行しなくても他のAPIは使用できますが、初回実行時に時間がかかることがあります。","operationId":"initialize_style_id_initialize_style_id_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","required":false,"schema":{"type":"boolean","title":"Skip Reinit","description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/is_initialized_style_id":{"get":{"tags":["その他"],"summary":"Is Initialized Style Id","description":"指定されたstyle_idのスタイルが初期化されているかどうかを返します。","operationId":"is_initialized_style_id_is_initialized_style_id_get","parameters":[{"required":true,"schema":{"type":"integer","title":"Style Id"},"name":"style_id","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Is Initialized Style Id Is Initialized Style Id Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_speaker":{"post":{"tags":["その他"],"summary":"Initialize Speaker","description":"こちらのAPIは非推奨です。`initialize_style_id`を利用してください。","operationId":"initialize_speaker_initialize_speaker_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"既に初期化済みの話者の再初期化をスキップするかどうか","required":false,"schema":{"type":"boolean","title":"Skip Reinit","description":"既に初期化済みの話者の再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}},"deprecated":true}},"/is_initialized_speaker":{"get":{"tags":["その他"],"summary":"Is Initialized Speaker","description":"こちらのAPIは非推奨です。`is_initialize_style_id`を利用してください。","operationId":"is_initialized_speaker_is_initialized_speaker_get","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Is Initialized Speaker Is Initialized Speaker Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}},"deprecated":true}},"/user_dict":{"get":{"tags":["ユーザー辞書"],"summary":"Get User Dict Words","description":"ユーザー辞書に登録されている単語の一覧を返します。\n単語の表層形(surface)は正規化済みの物を返します。\n\nReturns\n-------\ndict[str, UserDictWord]\n    単語のUUIDとその詳細","operationId":"get_user_dict_words_user_dict_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Response Get User Dict Words User Dict Get"}}}}}}},"/user_dict_word":{"post":{"tags":["ユーザー辞書"],"summary":"Add User Dict Word","description":"ユーザー辞書に言葉を追加します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"add_user_dict_word_user_dict_word_post","parameters":[{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Add User Dict Word User Dict Word Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict_word/{word_uuid}":{"put":{"tags":["ユーザー辞書"],"summary":"Rewrite User Dict Word","description":"ユーザー辞書に登録されている言葉を更新します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_uuid: str\n    更新する言葉のUUID\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"rewrite_user_dict_word_user_dict_word__word_uuid__put","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"},{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}},"delete":{"tags":["ユーザー辞書"],"summary":"Delete User Dict Word","description":"ユーザー辞書に登録されている言葉を削除します。\n\nParameters\n----------\nword_uuid: str\n    削除する言葉のUUID","operationId":"delete_user_dict_word_user_dict_word__word_uuid__delete","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/import_user_dict":{"post":{"tags":["ユーザー辞書"],"summary":"Import User Dict Words","description":"他のユーザー辞書をインポートします。\n\nParameters\n----------\nimport_dict_data: dict[str, UserDictWord]\n    インポートするユーザー辞書のデータ\noverride: bool\n    重複したエントリがあった場合、上書きするかどうか","operationId":"import_user_dict_words_import_user_dict_post","parameters":[{"required":true,"schema":{"type":"boolean","title":"Override"},"name":"override","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Import Dict Data"}}},"required":true},"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/supported_devices":{"get":{"tags":["その他"],"summary":"Supported Devices","operationId":"supported_devices_supported_devices_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SupportedDevicesInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/engine_manifest":{"get":{"tags":["その他"],"summary":"Engine Manifest","operationId":"engine_manifest_engine_manifest_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/EngineManifest"}}}}}}},"/validate_kana":{"post":{"tags":["その他"],"summary":"テキストがAquesTalk 風記法に従っているか判定する","description":"テキストがAquesTalk 風記法に従っているかどうかを判定します。\n従っていない場合はエラーが返ります。\n\nParameters\n----------\ntext: str\n    判定する対象の文字列","operationId":"validate_kana_validate_kana_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Validate Kana Validate Kana Post"}}}},"400":{"description":"テキストが不正です","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/setting":{"get":{"tags":["設定"],"summary":"Setting Get","description":"設定ページを返します。","operationId":"setting_get_setting_get","responses":{"200":{"description":"Successful Response"}}},"post":{"tags":["設定"],"summary":"Setting Post","description":"設定を更新します。","operationId":"setting_post_setting_post","requestBody":{"content":{"application/x-www-form-urlencoded":{"schema":{"$ref":"#/components/schemas/Body_setting_post_setting_post"}}},"required":true},"responses":{"200":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}}},"components":{"schemas":{"AccentPhrase":{"properties":{"moras":{"items":{"$ref":"#/components/schemas/Mora"},"type":"array","title":"モーラのリスト"},"accent":{"type":"integer","title":"アクセント箇所"},"pause_mora":{"allOf":[{"$ref":"#/components/schemas/Mora"}],"title":"後ろに無音を付けるかどうか"},"is_interrogative":{"type":"boolean","title":"疑問系かどうか","default":false}},"type":"object","required":["moras","accent"],"title":"AccentPhrase","description":"アクセント句ごとの情報"},"AudioQuery":{"properties":{"accent_phrases":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"アクセント句のリスト"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"},"outputSamplingRate":{"type":"integer","title":"音声データの出力サンプリングレート"},"outputStereo":{"type":"boolean","title":"音声データをステレオ出力するか否か"},"kana":{"type":"string","title":"[読み取り専用]AquesTalk 風記法によるテキスト。音声合成用のクエリとしては無視される"}},"type":"object","required":["accent_phrases","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength","outputSamplingRate","outputStereo"],"title":"AudioQuery","description":"音声合成用のクエリ"},"Body_setting_post_setting_post":{"properties":{"cors_policy_mode":{"$ref":"#/components/schemas/CorsPolicyMode"},"allow_origin":{"type":"string","title":"Allow Origin"}},"type":"object","required":["cors_policy_mode"],"title":"Body_setting_post_setting_post"},"CorsPolicyMode":{"type":"string","enum":["all","localapps"],"title":"CorsPolicyMode","description":"CORSの許可モード"},"DownloadableLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers"],"title":"DownloadableLibraryInfo","description":"ダウンロード可能な音声ライブラリの情報"},"EngineManifest":{"properties":{"manifest_version":{"type":"string","title":"マニフェストのバージョン"},"name":{"type":"string","title":"エンジン名"},"brand_name":{"type":"string","title":"ブランド名"},"uuid":{"type":"string","title":"エンジンのUUID"},"url":{"type":"string","title":"エンジンのURL"},"icon":{"type":"string","title":"エンジンのアイコンをBASE64エンコードしたもの"},"default_sampling_rate":{"type":"integer","title":"デフォルトのサンプリング周波数"},"frame_rate":{"type":"number","title":"エンジンのフレームレート"},"terms_of_service":{"type":"string","title":"エンジンの利用規約"},"update_infos":{"items":{"$ref":"#/components/schemas/UpdateInfo"},"type":"array","title":"エンジンのアップデート情報"},"dependency_licenses":{"items":{"$ref":"#/components/schemas/LicenseInfo"},"type":"array","title":"依存関係のライセンス情報"},"supported_vvlib_manifest_version":{"type":"string","title":"エンジンが対応するvvlibのバージョン"},"supported_features":{"allOf":[{"$ref":"#/components/schemas/SupportedFeatures"}],"title":"エンジンが持つ機能"}},"type":"object","required":["manifest_version","name","brand_name","uuid","url","icon","default_sampling_rate","frame_rate","terms_of_service","update_infos","dependency_licenses","supported_features"],"title":"EngineManifest","description":"エンジン自体に関する情報"},"FrameAudioQuery":{"properties":{"f0":{"items":{"type":"number"},"type":"array","title":"フレームごとの基本周波数"},"volume":{"items":{"type":"number"},"type":"array","title":"フレームごとの音量"},"phonemes":{"items":{"$ref":"#/components/schemas/FramePhoneme"},"type":"array","title":"音素のリスト"},"volumeScale":{"type":"number","title":"全体の音量"},"outputSamplingRate":{"type":"integer","title":"音声データの出力サンプリングレート"},"outputStereo":{"type":"boolean","title":"音声データをステレオ出力するか否か"}},"type":"object","required":["f0","volume","phonemes","volumeScale","outputSamplingRate","outputStereo"],"title":"FrameAudioQuery","description":"フレームごとの音声合成用のクエリ"},"FramePhoneme":{"properties":{"phoneme":{"type":"string","title":"音素"},"frame_length":{"type":"integer","title":"音素のフレーム長"}},"type":"object","required":["phoneme","frame_length"],"title":"FramePhoneme","description":"音素の情報"},"HTTPValidationError":{"properties":{"detail":{"items":{"$ref":"#/components/schemas/ValidationError"},"type":"array","title":"Detail"}},"type":"object","title":"HTTPValidationError"},"InstalledLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"},"uninstallable":{"type":"boolean","title":"アンインストール可能かどうか"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers","uninstallable"],"title":"InstalledLibraryInfo","description":"インストール済み音声ライブラリの情報"},"LibrarySpeaker":{"properties":{"speaker":{"allOf":[{"$ref":"#/components/schemas/Speaker"}],"title":"話者情報"},"speaker_info":{"allOf":[{"$ref":"#/components/schemas/SpeakerInfo"}],"title":"話者の追加情報"}},"type":"object","required":["speaker","speaker_info"],"title":"LibrarySpeaker","description":"音声ライブラリに含まれる話者の情報"},"LicenseInfo":{"properties":{"name":{"type":"string","title":"依存ライブラリ名"},"version":{"type":"string","title":"依存ライブラリのバージョン"},"license":{"type":"string","title":"依存ライブラリのライセンス名"},"text":{"type":"string","title":"依存ライブラリのライセンス本文"}},"type":"object","required":["name","text"],"title":"LicenseInfo","description":"依存ライブラリのライセンス情報"},"Mora":{"properties":{"text":{"type":"string","title":"文字"},"consonant":{"type":"string","title":"子音の音素"},"consonant_length":{"type":"number","title":"子音の音長"},"vowel":{"type":"string","title":"母音の音素"},"vowel_length":{"type":"number","title":"母音の音長"},"pitch":{"type":"number","title":"音高"}},"type":"object","required":["text","vowel","vowel_length","pitch"],"title":"Mora","description":"モーラ（子音＋母音）ごとの情報"},"MorphableTargetInfo":{"properties":{"is_morphable":{"type":"boolean","title":"指定した話者に対してモーフィングの可否"}},"type":"object","required":["is_morphable"],"title":"MorphableTargetInfo"},"Note":{"properties":{"key":{"type":"integer","title":"音階"},"frame_length":{"type":"integer","title":"音符のフレーム長"},"lyric":{"type":"string","title":"音符の歌詞"}},"type":"object","required":["frame_length","lyric"],"title":"Note","description":"音符ごとの情報"},"ParseKanaBadRequest":{"properties":{"text":{"type":"string","title":"エラーメッセージ"},"error_name":{"type":"string","title":"エラー名","description":"|name|description|\n|---|---|\n| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |\n| ACCENT_TOP | 句頭にアクセントは置けません: {text} |\n| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |\n| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |\n| EMPTY_PHRASE | {position}番目のアクセント句が空白です |\n| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |\n| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |"},"error_args":{"additionalProperties":{"type":"string"},"type":"object","title":"エラーを起こした箇所"}},"type":"object","required":["text","error_name","error_args"],"title":"ParseKanaBadRequest"},"Preset":{"properties":{"id":{"type":"integer","title":"プリセットID"},"name":{"type":"string","title":"プリセット名"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"style_id":{"type":"integer","title":"スタイルID"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"}},"type":"object","required":["id","name","speaker_uuid","style_id","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength"],"title":"Preset","description":"プリセット情報"},"Score":{"properties":{"notes":{"items":{"$ref":"#/components/schemas/Note"},"type":"array","title":"音符のリスト"}},"type":"object","required":["notes"],"title":"Score","description":"楽譜情報"},"Speaker":{"properties":{"supported_features":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportedFeatures"}],"title":"話者の対応機能"},"name":{"type":"string","title":"名前"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"styles":{"items":{"$ref":"#/components/schemas/SpeakerStyle"},"type":"array","title":"スタイルの一覧"},"version":{"type":"string","title":"Version","default":"話者のバージョン"}},"type":"object","required":["name","speaker_uuid","styles"],"title":"Speaker","description":"話者情報"},"SpeakerInfo":{"properties":{"policy":{"type":"string","title":"policy.md"},"portrait":{"type":"string","title":"portrait.pngをbase64エンコードしたもの"},"style_infos":{"items":{"$ref":"#/components/schemas/StyleInfo"},"type":"array","title":"スタイルの追加情報"}},"type":"object","required":["policy","portrait","style_infos"],"title":"SpeakerInfo","description":"話者の追加情報"},"SpeakerStyle":{"properties":{"name":{"type":"string","title":"スタイル名"},"id":{"type":"integer","title":"スタイルID"},"type":{"type":"string","enum":["talk","humming","sing_teacher"],"title":"モデルの種類"}},"type":"object","required":["name","id"],"title":"SpeakerStyle","description":"話者のスタイル情報"},"SpeakerSupportPermittedSynthesisMorphing":{"type":"string","enum":["ALL","SELF_ONLY","NOTHING"],"title":"SpeakerSupportPermittedSynthesisMorphing","description":"An enumeration."},"SpeakerSupportedFeatures":{"properties":{"permitted_synthesis_morphing":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportPermittedSynthesisMorphing"}],"title":"モーフィング機能への対応","default":"ALL"}},"type":"object","title":"SpeakerSupportedFeatures","description":"話者の対応機能の情報"},"StyleInfo":{"properties":{"id":{"type":"integer","title":"スタイルID"},"icon":{"type":"string","title":"当該スタイルのアイコンをbase64エンコードしたもの"},"portrait":{"type":"string","title":"当該スタイルのportrait.pngをbase64エンコードしたもの"},"voice_samples":{"items":{"type":"string"},"type":"array","title":"voice_sampleのwavファイルをbase64エンコードしたもの"}},"type":"object","required":["id","icon","voice_samples"],"title":"StyleInfo","description":"スタイルの追加情報"},"SupportedDevicesInfo":{"properties":{"cpu":{"type":"boolean","title":"CPUに対応しているか"},"cuda":{"type":"boolean","title":"CUDA(Nvidia GPU)に対応しているか"},"dml":{"type":"boolean","title":"DirectML(Nvidia GPU/Radeon GPU等)に対応しているか"}},"type":"object","required":["cpu","cuda","dml"],"title":"SupportedDevicesInfo","description":"対応しているデバイスの情報"},"SupportedFeatures":{"properties":{"adjust_mora_pitch":{"type":"boolean","title":"モーラごとの音高の調整"},"adjust_phoneme_length":{"type":"boolean","title":"音素ごとの長さの調整"},"adjust_speed_scale":{"type":"boolean","title":"全体の話速の調整"},"adjust_pitch_scale":{"type":"boolean","title":"全体の音高の調整"},"adjust_intonation_scale":{"type":"boolean","title":"全体の抑揚の調整"},"adjust_volume_scale":{"type":"boolean","title":"全体の音量の調整"},"interrogative_upspeak":{"type":"boolean","title":"疑問文の自動調整"},"synthesis_morphing":{"type":"boolean","title":"2種類のスタイルでモーフィングした音声を合成"},"manage_library":{"type":"boolean","title":"音声ライブラリのインストール・アンインストール"}},"type":"object","required":["adjust_mora_pitch","adjust_phoneme_length","adjust_speed_scale","adjust_pitch_scale","adjust_intonation_scale","adjust_volume_scale","interrogative_upspeak","synthesis_morphing"],"title":"SupportedFeatures","description":"エンジンが持つ機能の一覧"},"UpdateInfo":{"properties":{"version":{"type":"string","title":"エンジンのバージョン名"},"descriptions":{"items":{"type":"string"},"type":"array","title":"アップデートの詳細についての説明"},"contributors":{"items":{"type":"string"},"type":"array","title":"貢献者名"}},"type":"object","required":["version","descriptions"],"title":"UpdateInfo","description":"エンジンのアップデート情報"},"UserDictWord":{"properties":{"surface":{"type":"string","title":"表層形"},"priority":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"優先度"},"context_id":{"type":"integer","title":"文脈ID","default":1348},"part_of_speech":{"type":"string","title":"品詞"},"part_of_speech_detail_1":{"type":"string","title":"品詞細分類1"},"part_of_speech_detail_2":{"type":"string","title":"品詞細分類2"},"part_of_speech_detail_3":{"type":"string","title":"品詞細分類3"},"inflectional_type":{"type":"string","title":"活用型"},"inflectional_form":{"type":"string","title":"活用形"},"stem":{"type":"string","title":"原形"},"yomi":{"type":"string","title":"読み"},"pronunciation":{"type":"string","title":"発音"},"accent_type":{"type":"integer","title":"アクセント型"},"mora_count":{"type":"integer","title":"モーラ数"},"accent_associative_rule":{"type":"string","title":"アクセント結合規則"}},"type":"object","required":["surface","priority","part_of_speech","part_of_speech_detail_1","part_of_speech_detail_2","part_of_speech_detail_3","inflectional_type","inflectional_form","stem","yomi","pronunciation","accent_type","accent_associative_rule"],"title":"UserDictWord","description":"辞書のコンパイルに使われる情報"},"ValidationError":{"properties":{"loc":{"items":{"anyOf":[{"type":"string"},{"type":"integer"}]},"type":"array","title":"Location"},"msg":{"type":"string","title":"Message"},"type":{"type":"string","title":"Error Type"}},"type":"object","required":["loc","msg","type"],"title":"ValidationError"},"WordTypes":{"type":"string","enum":["PROPER_NOUN","COMMON_NOUN","VERB","ADJECTIVE","SUFFIX"],"title":"WordTypes","description":"fastapiでword_type引数を検証する時に使用するクラス"},"VvlibManifest":{"title":"VvlibManifest","description":"vvlib(VOICEVOX Library)に関する情報","type":"object","properties":{"manifest_version":{"title":"マニフェストバージョン","type":"string"},"name":{"title":"音声ライブラリ名","type":"string"},"version":{"title":"音声ライブラリバージョン","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"brand_name":{"title":"エンジンのブランド名","type":"string"},"engine_name":{"title":"エンジン名","type":"string"},"engine_uuid":{"title":"エンジンのUUID","type":"string"}},"required":["manifest_version","name","version","uuid","brand_name","engine_name","engine_uuid"]},"BaseLibraryInfo":{"title":"BaseLibraryInfo","description":"音声ライブラリの情報","type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}}},"required":["name","uuid","version","download_url","bytes","speakers"]}}}}
+{"openapi":"3.1.0","info":{"title":"VOICEVOX Engine","description":"VOICEVOXの音声合成エンジンです。","version":"latest"},"paths":{"/audio_query":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリを作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_audio_query_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/audio_query_from_preset":{"post":{"tags":["クエリ作成"],"summary":"音声合成用のクエリをプリセットを用いて作成する","description":"音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"audio_query_from_preset_audio_query_from_preset_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":true,"schema":{"type":"integer","title":"Preset Id"},"name":"preset_id","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/accent_phrases":{"post":{"tags":["クエリ編集"],"summary":"テキストからアクセント句を得る","description":"テキストからアクセント句を得ます。\nis_kanaが`true`のとき、テキストは次のAquesTalk 風記法で解釈されます。デフォルトは`false`です。\n* 全てのカナはカタカナで記述される\n* アクセント句は`/`または`、`で区切る。`、`で区切った場合に限り無音区間が挿入される。\n* カナの手前に`_`を入れるとそのカナは無声化される\n* アクセント位置を`'`で指定する。全てのアクセント句にはアクセント位置を1つ指定する必要がある。\n* アクセント句末に`？`(全角)を入れることにより疑問文の発音ができる。","operationId":"accent_phrases_accent_phrases_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"},{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"boolean","title":"Is Kana","default":false},"name":"is_kana","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Accent Phrases Accent Phrases Post"}}}},"400":{"description":"読み仮名のパースに失敗","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_data":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高・音素長を得る","operationId":"mora_data_mora_data_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Data Mora Data Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_length":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音素長を得る","operationId":"mora_length_mora_length_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Length Mora Length Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/mora_pitch":{"post":{"tags":["クエリ編集"],"summary":"アクセント句から音高を得る","operationId":"mora_pitch_mora_pitch_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Accent Phrases"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"Response Mora Pitch Mora Pitch Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する","operationId":"synthesis_synthesis_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"疑問系のテキストが与えられたら語尾を自動調整する","required":false,"schema":{"type":"boolean","title":"Enable Interrogative Upspeak","description":"疑問系のテキストが与えられたら語尾を自動調整する","default":true},"name":"enable_interrogative_upspeak","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/cancellable_synthesis":{"post":{"tags":["音声合成"],"summary":"音声合成する（キャンセル可能）","operationId":"cancellable_synthesis_cancellable_synthesis_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/multi_synthesis":{"post":{"tags":["音声合成"],"summary":"複数まとめて音声合成する","operationId":"multi_synthesis_multi_synthesis_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/AudioQuery"},"type":"array","title":"Queries"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/zip":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/morphable_targets":{"post":{"tags":["音声合成"],"summary":"指定したスタイルに対してエンジン内の話者がモーフィングが可能か判定する","description":"指定されたベーススタイルに対してエンジン内の各話者がモーフィング機能を利用可能か返します。\nモーフィングの許可/禁止は`/speakers`の`speaker.supported_features.synthesis_morphing`に記載されています。\nプロパティが存在しない場合は、モーフィングが許可されているとみなします。\n返り値の話者はstring型なので注意。","operationId":"morphable_targets_morphable_targets_post","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"items":{"type":"integer"},"type":"array","title":"Base Style Ids"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"additionalProperties":{"$ref":"#/components/schemas/MorphableTargetInfo"},"type":"object"},"type":"array","title":"Response Morphable Targets Morphable Targets Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/synthesis_morphing":{"post":{"tags":["音声合成"],"summary":"2種類のスタイルでモーフィングした音声を合成する","description":"指定された2種類のスタイルで音声を合成、指定した割合でモーフィングした音声を得ます。\nモーフィングの割合は`morph_rate`で指定でき、0.0でベースのスタイル、1.0でターゲットのスタイルに近づきます。","operationId":"_synthesis_morphing_synthesis_morphing_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Base Speaker"},"name":"base_speaker","in":"query"},{"required":true,"schema":{"type":"integer","title":"Target Speaker"},"name":"target_speaker","in":"query"},{"required":true,"schema":{"type":"number","maximum":1.0,"minimum":0.0,"title":"Morph Rate"},"name":"morph_rate","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/AudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/sing_frame_audio_query":{"post":{"tags":["クエリ作成"],"summary":"歌唱音声合成用のクエリを作成する","description":"歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。","operationId":"sing_frame_audio_query_sing_frame_audio_query_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Score"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/FrameAudioQuery"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/frame_synthesis":{"post":{"tags":["音声合成"],"summary":"Frame Synthesis","description":"歌唱音声合成を行います。","operationId":"frame_synthesis_frame_synthesis_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/FrameAudioQuery"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/connect_waves":{"post":{"tags":["その他"],"summary":"base64エンコードされた複数のwavデータを一つに結合する","description":"base64エンコードされたwavデータを一纏めにし、wavファイルで返します。","operationId":"connect_waves_connect_waves_post","requestBody":{"content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Waves"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"audio/wav":{"schema":{"type":"string","format":"binary"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/presets":{"get":{"tags":["その他"],"summary":"Get Presets","description":"エンジンが保持しているプリセットの設定を返します\n\nReturns\n-------\npresets: list[Preset]\n    プリセットのリスト","operationId":"get_presets_presets_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Preset"},"type":"array","title":"Response Get Presets Presets Get"}}}}}}},"/add_preset":{"post":{"tags":["その他"],"summary":"Add Preset","description":"新しいプリセットを追加します\n\nParameters\n-------\npreset: Preset\n    新しいプリセット。\n    プリセットIDが既存のものと重複している場合は、新規のプリセットIDが採番されます。\n\nReturns\n-------\nid: int\n    追加したプリセットのプリセットID","operationId":"add_preset_add_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Add Preset Add Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/update_preset":{"post":{"tags":["その他"],"summary":"Update Preset","description":"既存のプリセットを更新します\n\nParameters\n-------\npreset: Preset\n    更新するプリセット。\n    プリセットIDが更新対象と一致している必要があります。\n\nReturns\n-------\nid: int\n    更新したプリセットのプリセットID","operationId":"update_preset_update_preset_post","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/Preset"}}},"required":true},"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"integer","title":"Response Update Preset Update Preset Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/delete_preset":{"post":{"tags":["その他"],"summary":"Delete Preset","description":"既存のプリセットを削除します\n\nParameters\n-------\nid: int\n    削除するプリセットのプリセットID","operationId":"delete_preset_delete_preset_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Id"},"name":"id","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/version":{"get":{"tags":["その他"],"summary":"Version","operationId":"version_version_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Version Version Get"}}}}}}},"/core_versions":{"get":{"tags":["その他"],"summary":"Core Versions","operationId":"core_versions_core_versions_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"type":"string"},"type":"array","title":"Response Core Versions Core Versions Get"}}}}}}},"/speakers":{"get":{"tags":["その他"],"summary":"Speakers","operationId":"speakers_speakers_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/Speaker"},"type":"array","title":"Response Speakers Speakers Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/speaker_info":{"get":{"tags":["その他"],"summary":"Speaker Info","description":"指定されたspeaker_uuidに関する情報をjson形式で返します。\n画像や音声はbase64エンコードされたものが返されます。\n\nReturns\n-------\nret_data: SpeakerInfo","operationId":"speaker_info_speaker_info_get","parameters":[{"required":true,"schema":{"type":"string","title":"Speaker Uuid"},"name":"speaker_uuid","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SpeakerInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/downloadable_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Downloadable Libraries","description":"ダウンロード可能な音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: list[DownloadableLibrary]","operationId":"downloadable_libraries_downloadable_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"items":{"$ref":"#/components/schemas/DownloadableLibraryInfo"},"type":"array","title":"Response Downloadable Libraries Downloadable Libraries Get"}}}}}}},"/installed_libraries":{"get":{"tags":["音声ライブラリ管理"],"summary":"Installed Libraries","description":"インストールした音声ライブラリの情報を返します。\n\nReturns\n-------\nret_data: dict[str, InstalledLibrary]","operationId":"installed_libraries_installed_libraries_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/InstalledLibraryInfo"},"type":"object","title":"Response Installed Libraries Installed Libraries Get"}}}}}}},"/install_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Install Library","description":"音声ライブラリをインストールします。\n音声ライブラリのZIPファイルをリクエストボディとして送信してください。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"install_library_install_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/uninstall_library/{library_uuid}":{"post":{"tags":["音声ライブラリ管理"],"summary":"Uninstall Library","description":"音声ライブラリをアンインストールします。\n\nParameters\n----------\nlibrary_uuid: str\n    音声ライブラリのID","operationId":"uninstall_library_uninstall_library__library_uuid__post","parameters":[{"required":true,"schema":{"type":"string","title":"Library Uuid"},"name":"library_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/initialize_speaker":{"post":{"tags":["その他"],"summary":"Initialize Speaker","description":"指定されたスタイルを初期化します。\n実行しなくても他のAPIは使用できますが、初回実行時に時間がかかることがあります。","operationId":"initialize_speaker_initialize_speaker_post","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","required":false,"schema":{"type":"boolean","title":"Skip Reinit","description":"既に初期化済みのスタイルの再初期化をスキップするかどうか","default":false},"name":"skip_reinit","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/is_initialized_speaker":{"get":{"tags":["その他"],"summary":"Is Initialized Speaker","description":"指定されたスタイルが初期化されているかどうかを返します。","operationId":"is_initialized_speaker_is_initialized_speaker_get","parameters":[{"required":true,"schema":{"type":"integer","title":"Speaker"},"name":"speaker","in":"query"},{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Is Initialized Speaker Is Initialized Speaker Get"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict":{"get":{"tags":["ユーザー辞書"],"summary":"Get User Dict Words","description":"ユーザー辞書に登録されている単語の一覧を返します。\n単語の表層形(surface)は正規化済みの物を返します。\n\nReturns\n-------\ndict[str, UserDictWord]\n    単語のUUIDとその詳細","operationId":"get_user_dict_words_user_dict_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Response Get User Dict Words User Dict Get"}}}}}}},"/user_dict_word":{"post":{"tags":["ユーザー辞書"],"summary":"Add User Dict Word","description":"ユーザー辞書に言葉を追加します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"add_user_dict_word_user_dict_word_post","parameters":[{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"string","title":"Response Add User Dict Word User Dict Word Post"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/user_dict_word/{word_uuid}":{"put":{"tags":["ユーザー辞書"],"summary":"Rewrite User Dict Word","description":"ユーザー辞書に登録されている言葉を更新します。\n\nParameters\n----------\nsurface : str\n    言葉の表層形\npronunciation: str\n    言葉の発音（カタカナ）\naccent_type: int\n    アクセント型（音が下がる場所を指す）\nword_uuid: str\n    更新する言葉のUUID\nword_type: WordTypes, optional\n    PROPER_NOUN（固有名詞）、COMMON_NOUN（普通名詞）、VERB（動詞）、ADJECTIVE（形容詞）、SUFFIX（語尾）のいずれか\npriority: int, optional\n    単語の優先度（0から10までの整数）\n    数字が大きいほど優先度が高くなる\n    1から9までの値を指定することを推奨","operationId":"rewrite_user_dict_word_user_dict_word__word_uuid__put","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"},{"required":true,"schema":{"type":"string","title":"Surface"},"name":"surface","in":"query"},{"required":true,"schema":{"type":"string","title":"Pronunciation"},"name":"pronunciation","in":"query"},{"required":true,"schema":{"type":"integer","title":"Accent Type"},"name":"accent_type","in":"query"},{"required":false,"schema":{"$ref":"#/components/schemas/WordTypes"},"name":"word_type","in":"query"},{"required":false,"schema":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"Priority"},"name":"priority","in":"query"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}},"delete":{"tags":["ユーザー辞書"],"summary":"Delete User Dict Word","description":"ユーザー辞書に登録されている言葉を削除します。\n\nParameters\n----------\nword_uuid: str\n    削除する言葉のUUID","operationId":"delete_user_dict_word_user_dict_word__word_uuid__delete","parameters":[{"required":true,"schema":{"type":"string","title":"Word Uuid"},"name":"word_uuid","in":"path"}],"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/import_user_dict":{"post":{"tags":["ユーザー辞書"],"summary":"Import User Dict Words","description":"他のユーザー辞書をインポートします。\n\nParameters\n----------\nimport_dict_data: dict[str, UserDictWord]\n    インポートするユーザー辞書のデータ\noverride: bool\n    重複したエントリがあった場合、上書きするかどうか","operationId":"import_user_dict_words_import_user_dict_post","parameters":[{"required":true,"schema":{"type":"boolean","title":"Override"},"name":"override","in":"query"}],"requestBody":{"content":{"application/json":{"schema":{"additionalProperties":{"$ref":"#/components/schemas/UserDictWord"},"type":"object","title":"Import Dict Data"}}},"required":true},"responses":{"204":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/supported_devices":{"get":{"tags":["その他"],"summary":"Supported Devices","operationId":"supported_devices_supported_devices_get","parameters":[{"required":false,"schema":{"type":"string","title":"Core Version"},"name":"core_version","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/SupportedDevicesInfo"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/engine_manifest":{"get":{"tags":["その他"],"summary":"Engine Manifest","operationId":"engine_manifest_engine_manifest_get","responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/EngineManifest"}}}}}}},"/validate_kana":{"post":{"tags":["その他"],"summary":"テキストがAquesTalk 風記法に従っているか判定する","description":"テキストがAquesTalk 風記法に従っているかどうかを判定します。\n従っていない場合はエラーが返ります。\n\nParameters\n----------\ntext: str\n    判定する対象の文字列","operationId":"validate_kana_validate_kana_post","parameters":[{"required":true,"schema":{"type":"string","title":"Text"},"name":"text","in":"query"}],"responses":{"200":{"description":"Successful Response","content":{"application/json":{"schema":{"type":"boolean","title":"Response Validate Kana Validate Kana Post"}}}},"400":{"description":"テキストが不正です","content":{"application/json":{"schema":{"$ref":"#/components/schemas/ParseKanaBadRequest"}}}},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}},"/setting":{"get":{"tags":["設定"],"summary":"Setting Get","description":"設定ページを返します。","operationId":"setting_get_setting_get","responses":{"200":{"description":"Successful Response"}}},"post":{"tags":["設定"],"summary":"Setting Post","description":"設定を更新します。","operationId":"setting_post_setting_post","requestBody":{"content":{"application/x-www-form-urlencoded":{"schema":{"$ref":"#/components/schemas/Body_setting_post_setting_post"}}},"required":true},"responses":{"200":{"description":"Successful Response"},"422":{"description":"Validation Error","content":{"application/json":{"schema":{"$ref":"#/components/schemas/HTTPValidationError"}}}}}}}},"components":{"schemas":{"AccentPhrase":{"properties":{"moras":{"items":{"$ref":"#/components/schemas/Mora"},"type":"array","title":"モーラのリスト"},"accent":{"type":"integer","title":"アクセント箇所"},"pause_mora":{"allOf":[{"$ref":"#/components/schemas/Mora"}],"title":"後ろに無音を付けるかどうか"},"is_interrogative":{"type":"boolean","title":"疑問系かどうか","default":false}},"type":"object","required":["moras","accent"],"title":"AccentPhrase","description":"アクセント句ごとの情報"},"AudioQuery":{"properties":{"accent_phrases":{"items":{"$ref":"#/components/schemas/AccentPhrase"},"type":"array","title":"アクセント句のリスト"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"},"outputSamplingRate":{"type":"integer","title":"音声データの出力サンプリングレート"},"outputStereo":{"type":"boolean","title":"音声データをステレオ出力するか否か"},"kana":{"type":"string","title":"[読み取り専用]AquesTalk 風記法によるテキスト。音声合成用のクエリとしては無視される"}},"type":"object","required":["accent_phrases","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength","outputSamplingRate","outputStereo"],"title":"AudioQuery","description":"音声合成用のクエリ"},"Body_setting_post_setting_post":{"properties":{"cors_policy_mode":{"$ref":"#/components/schemas/CorsPolicyMode"},"allow_origin":{"type":"string","title":"Allow Origin"}},"type":"object","required":["cors_policy_mode"],"title":"Body_setting_post_setting_post"},"CorsPolicyMode":{"type":"string","enum":["all","localapps"],"title":"CorsPolicyMode","description":"CORSの許可モード"},"DownloadableLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers"],"title":"DownloadableLibraryInfo","description":"ダウンロード可能な音声ライブラリの情報"},"EngineManifest":{"properties":{"manifest_version":{"type":"string","title":"マニフェストのバージョン"},"name":{"type":"string","title":"エンジン名"},"brand_name":{"type":"string","title":"ブランド名"},"uuid":{"type":"string","title":"エンジンのUUID"},"url":{"type":"string","title":"エンジンのURL"},"icon":{"type":"string","title":"エンジンのアイコンをBASE64エンコードしたもの"},"default_sampling_rate":{"type":"integer","title":"デフォルトのサンプリング周波数"},"frame_rate":{"type":"number","title":"エンジンのフレームレート"},"terms_of_service":{"type":"string","title":"エンジンの利用規約"},"update_infos":{"items":{"$ref":"#/components/schemas/UpdateInfo"},"type":"array","title":"エンジンのアップデート情報"},"dependency_licenses":{"items":{"$ref":"#/components/schemas/LicenseInfo"},"type":"array","title":"依存関係のライセンス情報"},"supported_vvlib_manifest_version":{"type":"string","title":"エンジンが対応するvvlibのバージョン"},"supported_features":{"allOf":[{"$ref":"#/components/schemas/SupportedFeatures"}],"title":"エンジンが持つ機能"}},"type":"object","required":["manifest_version","name","brand_name","uuid","url","icon","default_sampling_rate","frame_rate","terms_of_service","update_infos","dependency_licenses","supported_features"],"title":"EngineManifest","description":"エンジン自体に関する情報"},"FrameAudioQuery":{"properties":{"f0":{"items":{"type":"number"},"type":"array","title":"フレームごとの基本周波数"},"volume":{"items":{"type":"number"},"type":"array","title":"フレームごとの音量"},"phonemes":{"items":{"$ref":"#/components/schemas/FramePhoneme"},"type":"array","title":"音素のリスト"},"volumeScale":{"type":"number","title":"全体の音量"},"outputSamplingRate":{"type":"integer","title":"音声データの出力サンプリングレート"},"outputStereo":{"type":"boolean","title":"音声データをステレオ出力するか否か"}},"type":"object","required":["f0","volume","phonemes","volumeScale","outputSamplingRate","outputStereo"],"title":"FrameAudioQuery","description":"フレームごとの音声合成用のクエリ"},"FramePhoneme":{"properties":{"phoneme":{"type":"string","title":"音素"},"frame_length":{"type":"integer","title":"音素のフレーム長"}},"type":"object","required":["phoneme","frame_length"],"title":"FramePhoneme","description":"音素の情報"},"HTTPValidationError":{"properties":{"detail":{"items":{"$ref":"#/components/schemas/ValidationError"},"type":"array","title":"Detail"}},"type":"object","title":"HTTPValidationError"},"InstalledLibraryInfo":{"properties":{"name":{"type":"string","title":"音声ライブラリの名前"},"uuid":{"type":"string","title":"音声ライブラリのUUID"},"version":{"type":"string","title":"音声ライブラリのバージョン"},"download_url":{"type":"string","title":"音声ライブラリのダウンロードURL"},"bytes":{"type":"integer","title":"音声ライブラリのバイト数"},"speakers":{"items":{"$ref":"#/components/schemas/LibrarySpeaker"},"type":"array","title":"音声ライブラリに含まれる話者のリスト"},"uninstallable":{"type":"boolean","title":"アンインストール可能かどうか"}},"type":"object","required":["name","uuid","version","download_url","bytes","speakers","uninstallable"],"title":"InstalledLibraryInfo","description":"インストール済み音声ライブラリの情報"},"LibrarySpeaker":{"properties":{"speaker":{"allOf":[{"$ref":"#/components/schemas/Speaker"}],"title":"話者情報"},"speaker_info":{"allOf":[{"$ref":"#/components/schemas/SpeakerInfo"}],"title":"話者の追加情報"}},"type":"object","required":["speaker","speaker_info"],"title":"LibrarySpeaker","description":"音声ライブラリに含まれる話者の情報"},"LicenseInfo":{"properties":{"name":{"type":"string","title":"依存ライブラリ名"},"version":{"type":"string","title":"依存ライブラリのバージョン"},"license":{"type":"string","title":"依存ライブラリのライセンス名"},"text":{"type":"string","title":"依存ライブラリのライセンス本文"}},"type":"object","required":["name","text"],"title":"LicenseInfo","description":"依存ライブラリのライセンス情報"},"Mora":{"properties":{"text":{"type":"string","title":"文字"},"consonant":{"type":"string","title":"子音の音素"},"consonant_length":{"type":"number","title":"子音の音長"},"vowel":{"type":"string","title":"母音の音素"},"vowel_length":{"type":"number","title":"母音の音長"},"pitch":{"type":"number","title":"音高"}},"type":"object","required":["text","vowel","vowel_length","pitch"],"title":"Mora","description":"モーラ（子音＋母音）ごとの情報"},"MorphableTargetInfo":{"properties":{"is_morphable":{"type":"boolean","title":"指定した話者に対してモーフィングの可否"}},"type":"object","required":["is_morphable"],"title":"MorphableTargetInfo"},"Note":{"properties":{"key":{"type":"integer","title":"音階"},"frame_length":{"type":"integer","title":"音符のフレーム長"},"lyric":{"type":"string","title":"音符の歌詞"}},"type":"object","required":["frame_length","lyric"],"title":"Note","description":"音符ごとの情報"},"ParseKanaBadRequest":{"properties":{"text":{"type":"string","title":"エラーメッセージ"},"error_name":{"type":"string","title":"エラー名","description":"|name|description|\n|---|---|\n| UNKNOWN_TEXT | 判別できない読み仮名があります: {text} |\n| ACCENT_TOP | 句頭にアクセントは置けません: {text} |\n| ACCENT_TWICE | 1つのアクセント句に二つ以上のアクセントは置けません: {text} |\n| ACCENT_NOTFOUND | アクセントを指定していないアクセント句があります: {text} |\n| EMPTY_PHRASE | {position}番目のアクセント句が空白です |\n| INTERROGATION_MARK_NOT_AT_END | アクセント句末以外に「？」は置けません: {text} |\n| INFINITE_LOOP | 処理時に無限ループになってしまいました...バグ報告をお願いします。 |"},"error_args":{"additionalProperties":{"type":"string"},"type":"object","title":"エラーを起こした箇所"}},"type":"object","required":["text","error_name","error_args"],"title":"ParseKanaBadRequest"},"Preset":{"properties":{"id":{"type":"integer","title":"プリセットID"},"name":{"type":"string","title":"プリセット名"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"style_id":{"type":"integer","title":"スタイルID"},"speedScale":{"type":"number","title":"全体の話速"},"pitchScale":{"type":"number","title":"全体の音高"},"intonationScale":{"type":"number","title":"全体の抑揚"},"volumeScale":{"type":"number","title":"全体の音量"},"prePhonemeLength":{"type":"number","title":"音声の前の無音時間"},"postPhonemeLength":{"type":"number","title":"音声の後の無音時間"}},"type":"object","required":["id","name","speaker_uuid","style_id","speedScale","pitchScale","intonationScale","volumeScale","prePhonemeLength","postPhonemeLength"],"title":"Preset","description":"プリセット情報"},"Score":{"properties":{"notes":{"items":{"$ref":"#/components/schemas/Note"},"type":"array","title":"音符のリスト"}},"type":"object","required":["notes"],"title":"Score","description":"楽譜情報"},"Speaker":{"properties":{"supported_features":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportedFeatures"}],"title":"話者の対応機能"},"name":{"type":"string","title":"名前"},"speaker_uuid":{"type":"string","title":"話者のUUID"},"styles":{"items":{"$ref":"#/components/schemas/SpeakerStyle"},"type":"array","title":"スタイルの一覧"},"version":{"type":"string","title":"Version","default":"話者のバージョン"}},"type":"object","required":["name","speaker_uuid","styles"],"title":"Speaker","description":"話者情報"},"SpeakerInfo":{"properties":{"policy":{"type":"string","title":"policy.md"},"portrait":{"type":"string","title":"portrait.pngをbase64エンコードしたもの"},"style_infos":{"items":{"$ref":"#/components/schemas/StyleInfo"},"type":"array","title":"スタイルの追加情報"}},"type":"object","required":["policy","portrait","style_infos"],"title":"SpeakerInfo","description":"話者の追加情報"},"SpeakerStyle":{"properties":{"name":{"type":"string","title":"スタイル名"},"id":{"type":"integer","title":"スタイルID"},"type":{"type":"string","enum":["talk","humming","sing_teacher","sing"],"title":"モデルの種類","default":"talk"}},"type":"object","required":["name","id"],"title":"SpeakerStyle","description":"話者のスタイル情報"},"SpeakerSupportPermittedSynthesisMorphing":{"type":"string","enum":["ALL","SELF_ONLY","NOTHING"],"title":"SpeakerSupportPermittedSynthesisMorphing","description":"An enumeration."},"SpeakerSupportedFeatures":{"properties":{"permitted_synthesis_morphing":{"allOf":[{"$ref":"#/components/schemas/SpeakerSupportPermittedSynthesisMorphing"}],"title":"モーフィング機能への対応","default":"ALL"}},"type":"object","title":"SpeakerSupportedFeatures","description":"話者の対応機能の情報"},"StyleInfo":{"properties":{"id":{"type":"integer","title":"スタイルID"},"icon":{"type":"string","title":"当該スタイルのアイコンをbase64エンコードしたもの"},"portrait":{"type":"string","title":"当該スタイルのportrait.pngをbase64エンコードしたもの"},"voice_samples":{"items":{"type":"string"},"type":"array","title":"voice_sampleのwavファイルをbase64エンコードしたもの"}},"type":"object","required":["id","icon","voice_samples"],"title":"StyleInfo","description":"スタイルの追加情報"},"SupportedDevicesInfo":{"properties":{"cpu":{"type":"boolean","title":"CPUに対応しているか"},"cuda":{"type":"boolean","title":"CUDA(Nvidia GPU)に対応しているか"},"dml":{"type":"boolean","title":"DirectML(Nvidia GPU/Radeon GPU等)に対応しているか"}},"type":"object","required":["cpu","cuda","dml"],"title":"SupportedDevicesInfo","description":"対応しているデバイスの情報"},"SupportedFeatures":{"properties":{"adjust_mora_pitch":{"type":"boolean","title":"モーラごとの音高の調整"},"adjust_phoneme_length":{"type":"boolean","title":"音素ごとの長さの調整"},"adjust_speed_scale":{"type":"boolean","title":"全体の話速の調整"},"adjust_pitch_scale":{"type":"boolean","title":"全体の音高の調整"},"adjust_intonation_scale":{"type":"boolean","title":"全体の抑揚の調整"},"adjust_volume_scale":{"type":"boolean","title":"全体の音量の調整"},"interrogative_upspeak":{"type":"boolean","title":"疑問文の自動調整"},"synthesis_morphing":{"type":"boolean","title":"2種類のスタイルでモーフィングした音声を合成"},"manage_library":{"type":"boolean","title":"音声ライブラリのインストール・アンインストール"}},"type":"object","required":["adjust_mora_pitch","adjust_phoneme_length","adjust_speed_scale","adjust_pitch_scale","adjust_intonation_scale","adjust_volume_scale","interrogative_upspeak","synthesis_morphing"],"title":"SupportedFeatures","description":"エンジンが持つ機能の一覧"},"UpdateInfo":{"properties":{"version":{"type":"string","title":"エンジンのバージョン名"},"descriptions":{"items":{"type":"string"},"type":"array","title":"アップデートの詳細についての説明"},"contributors":{"items":{"type":"string"},"type":"array","title":"貢献者名"}},"type":"object","required":["version","descriptions"],"title":"UpdateInfo","description":"エンジンのアップデート情報"},"UserDictWord":{"properties":{"surface":{"type":"string","title":"表層形"},"priority":{"type":"integer","maximum":10.0,"minimum":0.0,"title":"優先度"},"context_id":{"type":"integer","title":"文脈ID","default":1348},"part_of_speech":{"type":"string","title":"品詞"},"part_of_speech_detail_1":{"type":"string","title":"品詞細分類1"},"part_of_speech_detail_2":{"type":"string","title":"品詞細分類2"},"part_of_speech_detail_3":{"type":"string","title":"品詞細分類3"},"inflectional_type":{"type":"string","title":"活用型"},"inflectional_form":{"type":"string","title":"活用形"},"stem":{"type":"string","title":"原形"},"yomi":{"type":"string","title":"読み"},"pronunciation":{"type":"string","title":"発音"},"accent_type":{"type":"integer","title":"アクセント型"},"mora_count":{"type":"integer","title":"モーラ数"},"accent_associative_rule":{"type":"string","title":"アクセント結合規則"}},"type":"object","required":["surface","priority","part_of_speech","part_of_speech_detail_1","part_of_speech_detail_2","part_of_speech_detail_3","inflectional_type","inflectional_form","stem","yomi","pronunciation","accent_type","accent_associative_rule"],"title":"UserDictWord","description":"辞書のコンパイルに使われる情報"},"ValidationError":{"properties":{"loc":{"items":{"anyOf":[{"type":"string"},{"type":"integer"}]},"type":"array","title":"Location"},"msg":{"type":"string","title":"Message"},"type":{"type":"string","title":"Error Type"}},"type":"object","required":["loc","msg","type"],"title":"ValidationError"},"WordTypes":{"type":"string","enum":["PROPER_NOUN","COMMON_NOUN","VERB","ADJECTIVE","SUFFIX"],"title":"WordTypes","description":"fastapiでword_type引数を検証する時に使用するクラス"},"VvlibManifest":{"title":"VvlibManifest","description":"vvlib(VOICEVOX Library)に関する情報","type":"object","properties":{"manifest_version":{"title":"マニフェストバージョン","type":"string"},"name":{"title":"音声ライブラリ名","type":"string"},"version":{"title":"音声ライブラリバージョン","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"brand_name":{"title":"エンジンのブランド名","type":"string"},"engine_name":{"title":"エンジン名","type":"string"},"engine_uuid":{"title":"エンジンのUUID","type":"string"}},"required":["manifest_version","name","version","uuid","brand_name","engine_name","engine_uuid"]},"BaseLibraryInfo":{"title":"BaseLibraryInfo","description":"音声ライブラリの情報","type":"object","properties":{"name":{"title":"音声ライブラリの名前","type":"string"},"uuid":{"title":"音声ライブラリのUUID","type":"string"},"version":{"title":"音声ライブラリのバージョン","type":"string"},"download_url":{"title":"音声ライブラリのダウンロードURL","type":"string"},"bytes":{"title":"音声ライブラリのバイト数","type":"integer"},"speakers":{"title":"音声ライブラリに含まれる話者のリスト","type":"array","items":{"$ref":"#/components/schemas/LibrarySpeaker"}}},"required":["name","uuid","version","download_url","bytes","speakers"]}}}}
\ No newline at end of file
diff --git a/src/openapi/apis/DefaultApi.ts b/src/openapi/apis/DefaultApi.ts
index db3316c878..c421065005 100644
--- a/src/openapi/apis/DefaultApi.ts
+++ b/src/openapi/apis/DefaultApi.ts
@@ -120,9 +120,8 @@ export interface DeleteUserDictWordUserDictWordWordUuidDeleteRequest {
 }
 
 export interface FrameSynthesisFrameSynthesisPostRequest {
+    speaker: number;
     frameAudioQuery: FrameAudioQuery;
-    styleId?: number;
-    speaker?: number;
     coreVersion?: string;
 }
 
@@ -190,9 +189,8 @@ export interface SettingPostSettingPostRequest {
 }
 
 export interface SingFrameAudioQuerySingFrameAudioQueryPostRequest {
+    speaker: number;
     score: Score;
-    styleId?: number;
-    speaker?: number;
     coreVersion?: string;
 }
 
@@ -445,9 +443,8 @@ export interface DefaultApiInterface {
     /**
      * 歌唱音声合成を行います。
      * @summary Frame Synthesis
+     * @param {number} speaker 
      * @param {FrameAudioQuery} frameAudioQuery 
-     * @param {number} [styleId] 
-     * @param {number} [speaker] 
      * @param {string} [coreVersion] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
@@ -715,9 +712,8 @@ export interface DefaultApiInterface {
     /**
      * 歌唱音声合成用のクエリの初期値を得ます。ここで得られたクエリはそのまま歌唱音声合成に利用できます。各値の意味は`Schemas`を参照してください。
      * @summary 歌唱音声合成用のクエリを作成する
+     * @param {number} speaker 
      * @param {Score} score 
-     * @param {number} [styleId] 
-     * @param {number} [speaker] 
      * @param {string} [coreVersion] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
@@ -1367,16 +1363,16 @@ export class DefaultApi extends runtime.BaseAPI implements DefaultApiInterface {
      * Frame Synthesis
      */
     async frameSynthesisFrameSynthesisPostRaw(requestParameters: FrameSynthesisFrameSynthesisPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Blob>> {
+        if (requestParameters.speaker === null || requestParameters.speaker === undefined) {
+            throw new runtime.RequiredError('speaker','Required parameter requestParameters.speaker was null or undefined when calling frameSynthesisFrameSynthesisPost.');
+        }
+
         if (requestParameters.frameAudioQuery === null || requestParameters.frameAudioQuery === undefined) {
             throw new runtime.RequiredError('frameAudioQuery','Required parameter requestParameters.frameAudioQuery was null or undefined when calling frameSynthesisFrameSynthesisPost.');
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.styleId !== undefined) {
-            queryParameters['style_id'] = requestParameters.styleId;
-        }
-
         if (requestParameters.speaker !== undefined) {
             queryParameters['speaker'] = requestParameters.speaker;
         }
@@ -2021,16 +2017,16 @@ export class DefaultApi extends runtime.BaseAPI implements DefaultApiInterface {
      * 歌唱音声合成用のクエリを作成する
      */
     async singFrameAudioQuerySingFrameAudioQueryPostRaw(requestParameters: SingFrameAudioQuerySingFrameAudioQueryPostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FrameAudioQuery>> {
+        if (requestParameters.speaker === null || requestParameters.speaker === undefined) {
+            throw new runtime.RequiredError('speaker','Required parameter requestParameters.speaker was null or undefined when calling singFrameAudioQuerySingFrameAudioQueryPost.');
+        }
+
         if (requestParameters.score === null || requestParameters.score === undefined) {
             throw new runtime.RequiredError('score','Required parameter requestParameters.score was null or undefined when calling singFrameAudioQuerySingFrameAudioQueryPost.');
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.styleId !== undefined) {
-            queryParameters['style_id'] = requestParameters.styleId;
-        }
-
         if (requestParameters.speaker !== undefined) {
             queryParameters['speaker'] = requestParameters.speaker;
         }
diff --git a/src/openapi/models/SpeakerStyle.ts b/src/openapi/models/SpeakerStyle.ts
index b611ac0186..e634478dbb 100644
--- a/src/openapi/models/SpeakerStyle.ts
+++ b/src/openapi/models/SpeakerStyle.ts
@@ -46,7 +46,8 @@ export interface SpeakerStyle {
 export const SpeakerStyleTypeEnum = {
     Talk: 'talk',
     Humming: 'humming',
-    SingTeacher: 'sing_teacher'
+    SingTeacher: 'sing_teacher',
+    Sing: 'sing'
 } as const;
 export type SpeakerStyleTypeEnum = typeof SpeakerStyleTypeEnum[keyof typeof SpeakerStyleTypeEnum];
 
diff --git a/src/store/singing.ts b/src/store/singing.ts
index d99a094976..f9d1e63251 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -930,7 +930,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             "singFrameAudioQuerySingFrameAudioQueryPost"
           )({
             score: { notes },
-            styleId: 999, // TODO: 設定できるようにする
+            speaker: 6000, // TODO: 設定できるようにする
           });
         } catch (error) {
           const lyrics = notes.map((value) => value.lyric).join("");
@@ -967,7 +967,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
           });
           return await instance.invoke("frameSynthesisFrameSynthesisPost")({
             frameAudioQuery: query,
-            styleId: singer.styleId,
+            speaker: singer.styleId,
           });
         } catch (error) {
           const phonemes = query.phonemes
diff --git a/src/type/preload.ts b/src/type/preload.ts
index f1c10af1ac..fd7048bb18 100644
--- a/src/type/preload.ts
+++ b/src/type/preload.ts
@@ -253,7 +253,7 @@ export type AppInfos = {
   version: string;
 };
 
-export type StyleType = "talk" | "humming" | "sing_teacher";
+export type StyleType = "talk" | "humming" | "sing_teacher" | "sing";
 
 export type StyleInfo = {
   styleName?: string;

From 9f016996de67366ab8e2e02722faa9e6b77c1429 Mon Sep 17 00:00:00 2001
From: Sig <sigprogrammer@gmail.com>
Date: Mon, 29 Jan 2024 00:25:02 +0900
Subject: [PATCH 58/59] =?UTF-8?q?[project-s]=20Esc=E3=82=AD=E3=83=BC?=
 =?UTF-8?q?=E3=81=A7=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AE=E9=81=B8=E6=8A=9E?=
 =?UTF-8?q?=E3=82=92=E5=85=A8=E3=81=A6=E8=A7=A3=E9=99=A4=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B=20(#1775?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 「ノートの選択を全て解除する」のショートカットを追加、ノート編集後に選択が解除されないように変更

* ファイルを移動して名前を変更
---
 src/components/Sing/ScoreSequencer.vue                        | 4 ++--
 .../AudioRenderer.ts => sing/audioRendering.ts}               | 0
 src/store/singing.ts                                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{infrastructures/AudioRenderer.ts => sing/audioRendering.ts} (100%)

diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index 972f1c5858..d51ac2d275 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -756,7 +756,6 @@ export default defineComponent({
           });
         } else {
           store.dispatch("UPDATE_NOTES", { notes: previewNotes.value });
-          store.dispatch("DESELECT_ALL_NOTES");
         }
         if (previewNotes.value.length === 1) {
           store.dispatch("PLAY_PREVIEW_SOUND", {
@@ -890,7 +889,8 @@ export default defineComponent({
         case "Delete":
           handleNotesBackspaceOrDelete();
           break;
-        default:
+        case "Escape":
+          store.dispatch("DESELECT_ALL_NOTES");
           break;
       }
     };
diff --git a/src/infrastructures/AudioRenderer.ts b/src/sing/audioRendering.ts
similarity index 100%
rename from src/infrastructures/AudioRenderer.ts
rename to src/sing/audioRendering.ts
diff --git a/src/store/singing.ts b/src/store/singing.ts
index f9d1e63251..206145d734 100644
--- a/src/store/singing.ts
+++ b/src/store/singing.ts
@@ -32,7 +32,7 @@ import {
   PolySynth,
   Sequence,
   Transport,
-} from "@/infrastructures/AudioRenderer";
+} from "@/sing/audioRendering";
 import {
   getMeasureDuration,
   isValidNote,

From 7d1772b166132dae881fd4179ea446c050d9e677 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Mon, 29 Jan 2024 02:07:43 +0900
Subject: [PATCH 59/59] =?UTF-8?q?[refactor]=20Talk=E7=B3=BB=E7=A7=BB?=
 =?UTF-8?q?=E5=8B=95=20(#1762)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Talk系移動

* TalkのEditorHome移動

* 対応早見表の更新

* 辞書からの依存更新忘れ
---
 ...277\234\346\227\251\350\246\213\350\241\250.md" | 14 +++++++-------
 src/components/DictionaryManageDialog.vue          |  2 +-
 src/components/{ => Talk}/AccentPhrase.vue         |  4 ++--
 src/components/{ => Talk}/AudioAccent.vue          |  0
 src/components/{ => Talk}/AudioCell.vue            |  9 ++++++---
 src/components/{ => Talk}/AudioDetail.vue          |  2 +-
 src/components/{ => Talk}/AudioInfo.vue            |  4 ++--
 src/components/{ => Talk}/AudioParameter.vue       |  0
 src/components/{ => Talk}/CharacterPortrait.vue    |  0
 src/{views => components/Talk}/EditorHome.vue      |  8 ++++----
 src/router/index.ts                                |  2 +-
 11 files changed, 24 insertions(+), 21 deletions(-)
 rename src/components/{ => Talk}/AccentPhrase.vue (99%)
 rename src/components/{ => Talk}/AudioAccent.vue (100%)
 rename src/components/{ => Talk}/AudioCell.vue (99%)
 rename src/components/{ => Talk}/AudioDetail.vue (99%)
 rename src/components/{ => Talk}/AudioInfo.vue (99%)
 rename src/components/{ => Talk}/AudioParameter.vue (100%)
 rename src/components/{ => Talk}/CharacterPortrait.vue (100%)
 rename src/{views => components/Talk}/EditorHome.vue (99%)

diff --git "a/docs/UI\345\220\215\347\247\260\343\201\250Vue\343\203\225\343\202\241\343\202\244\343\203\253\345\220\215\343\201\256\345\257\276\345\277\234\346\227\251\350\246\213\350\241\250.md" "b/docs/UI\345\220\215\347\247\260\343\201\250Vue\343\203\225\343\202\241\343\202\244\343\203\253\345\220\215\343\201\256\345\257\276\345\277\234\346\227\251\350\246\213\350\241\250.md"
index 56b96d2d57..72eb3b05f8 100644
--- "a/docs/UI\345\220\215\347\247\260\343\201\250Vue\343\203\225\343\202\241\343\202\244\343\203\253\345\220\215\343\201\256\345\257\276\345\277\234\346\227\251\350\246\213\350\241\250.md"
+++ "b/docs/UI\345\220\215\347\247\260\343\201\250Vue\343\203\225\343\202\241\343\202\244\343\203\253\345\220\215\343\201\256\345\257\276\345\277\234\346\227\251\350\246\213\350\241\250.md"
@@ -12,7 +12,7 @@
 
 ### views ディレクトリ
 
-- メイン画面全体 ･･･ [EditorHome](../src/views/EditorHome.vue)
+- メイン画面全体 ･･･ [EditorHome](../src/components/Talk/EditorHome.vue)
 
 ### compornents ディレクトリ
 
@@ -37,16 +37,16 @@
   - ウィンドウ右上のボタン群（ピンボタン含む） ･･･ [TitleBarButtons](../src/components/TitleBarButtons.vue)
     - ピンボタン以外のボタン ･･･ [MinMaxCloseButtons](../src/components/MinMaxCloseButtons.vue)
 - ツールバー ･･･ [HeaderBar](../src/components/HeaderBar.vue)
-- キャラクター表示欄 ･･･ [CharacterPortrait](../src/components/CharacterPortrait.vue)
+- キャラクター表示欄 ･･･ [CharacterPortrait](../src/components/Talk/CharacterPortrait.vue)
 - 台本欄（テキスト欄追加ボタンを含む） ･･･ [views/EditorHome](../src/views/EditorHome.vue) に含まれる
-  - レーン（行番号・テキスト欄含む） ･･･ [AudioCell](../src/components/AudioCell.vue)
+  - レーン（行番号・テキスト欄含む） ･･･ [AudioCell](../src/components/Talk/AudioCell.vue)
     - キャラクターアイコン ･･･ [CharacterButton](../src/components/CharacterButton.vue)
     - コンテキスト（右クリック）メニュー ･･･ [ContextMenu](../src/components/ContextMenu.vue)
-- パラメータ調整欄 ･･･ [AudioInfo](../src/components/AudioInfo.vue)
+- パラメータ調整欄 ･･･ [AudioInfo](../src/components/Talk/AudioInfo.vue)
   - プリセット管理 ･･･ [PresetManageDialog](../src/components/PresetManageDialog.vue)
-- 詳細調整欄（各項目・再生ボタンを含む） ･･･ [AudioDetail](../src/components/AudioDetail.vue)
-  - ｱｸｾﾝﾄ項目のうち、文字以外の部分の UI ･･･ [AudioAccent](../src/components/AudioAccent.vue)
-  - ｲﾝﾄﾈｰｼｮﾝ・長さ項目のスライダー [AudioParameter](../src/components/AudioParameter.vue)
+- 詳細調整欄（各項目・再生ボタンを含む） ･･･ [AudioDetail](../src/components/Talk/AudioDetail.vue)
+  - ｱｸｾﾝﾄ項目のうち、文字以外の部分の UI ･･･ [AudioAccent](../src/components/Talk/AudioAccent.vue)
+  - ｲﾝﾄﾈｰｼｮﾝ・長さ項目のスライダー [AudioParameter](../src/components/Talk/AudioParameter.vue)
 - その他
   - 初回起動時に表示される画面
     - 利用規約 ･･･ [AcceptTermsDialog](../src/components/AcceptTermsDialog.vue)
diff --git a/src/components/DictionaryManageDialog.vue b/src/components/DictionaryManageDialog.vue
index e373e40d97..1c489a9a90 100644
--- a/src/components/DictionaryManageDialog.vue
+++ b/src/components/DictionaryManageDialog.vue
@@ -251,7 +251,7 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
 import { QInput } from "quasar";
-import AudioAccent from "./AudioAccent.vue";
+import AudioAccent from "@/components/Talk/AudioAccent.vue";
 import { useStore } from "@/store";
 import { AccentPhrase, UserDictWord } from "@/openapi";
 import {
diff --git a/src/components/AccentPhrase.vue b/src/components/Talk/AccentPhrase.vue
similarity index 99%
rename from src/components/AccentPhrase.vue
rename to src/components/Talk/AccentPhrase.vue
index 993b847f34..0248dee985 100644
--- a/src/components/AccentPhrase.vue
+++ b/src/components/Talk/AccentPhrase.vue
@@ -209,8 +209,8 @@
 import { computed, ref } from "vue";
 import AudioAccent from "./AudioAccent.vue";
 import AudioParameter from "./AudioParameter.vue";
-import ContextMenu from "./ContextMenu.vue";
-import { MenuItemButton } from "./BaseMenuBar.vue";
+import { MenuItemButton } from "@/components/BaseMenuBar.vue";
+import ContextMenu from "@/components/ContextMenu.vue";
 import { useStore } from "@/store";
 import { AudioKey, MoraDataType } from "@/type/preload";
 import { Mora } from "@/openapi/models/Mora";
diff --git a/src/components/AudioAccent.vue b/src/components/Talk/AudioAccent.vue
similarity index 100%
rename from src/components/AudioAccent.vue
rename to src/components/Talk/AudioAccent.vue
diff --git a/src/components/AudioCell.vue b/src/components/Talk/AudioCell.vue
similarity index 99%
rename from src/components/AudioCell.vue
rename to src/components/Talk/AudioCell.vue
index 5b55595893..0bd0d98dde 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/Talk/AudioCell.vue
@@ -112,9 +112,12 @@
 <script setup lang="ts">
 import { computed, watch, ref, nextTick } from "vue";
 import { QInput } from "quasar";
-import CharacterButton from "./CharacterButton.vue";
-import { MenuItemButton, MenuItemSeparator } from "./BaseMenuBar.vue";
-import ContextMenu from "./ContextMenu.vue";
+import CharacterButton from "@/components/CharacterButton.vue";
+import {
+  MenuItemButton,
+  MenuItemSeparator,
+} from "@/components/BaseMenuBar.vue";
+import ContextMenu from "@/components/ContextMenu.vue";
 import { useStore } from "@/store";
 import { AudioKey, SplitTextWhenPasteType, Voice } from "@/type/preload";
 import { SelectionHelperForQInput } from "@/helpers/SelectionHelperForQInput";
diff --git a/src/components/AudioDetail.vue b/src/components/Talk/AudioDetail.vue
similarity index 99%
rename from src/components/AudioDetail.vue
rename to src/components/Talk/AudioDetail.vue
index be8145cd8b..9ca4539583 100644
--- a/src/components/AudioDetail.vue
+++ b/src/components/Talk/AudioDetail.vue
@@ -82,8 +82,8 @@
 
 <script setup lang="ts">
 import { computed, nextTick, ref, watch } from "vue";
-import ToolTip from "./ToolTip.vue";
 import AccentPhrase from "./AccentPhrase.vue";
+import ToolTip from "@/components/ToolTip.vue";
 import { useStore } from "@/store";
 import {
   AudioKey,
diff --git a/src/components/AudioInfo.vue b/src/components/Talk/AudioInfo.vue
similarity index 99%
rename from src/components/AudioInfo.vue
rename to src/components/Talk/AudioInfo.vue
index e893e1655f..777688309a 100644
--- a/src/components/AudioInfo.vue
+++ b/src/components/Talk/AudioInfo.vue
@@ -301,8 +301,8 @@
 <script setup lang="ts">
 import { computed, ref, watchEffect } from "vue";
 import { QSelectProps } from "quasar";
-import CharacterButton from "./CharacterButton.vue";
-import PresetManageDialog from "./PresetManageDialog.vue";
+import CharacterButton from "@/components/CharacterButton.vue";
+import PresetManageDialog from "@/components/PresetManageDialog.vue";
 import { useStore } from "@/store";
 
 import {
diff --git a/src/components/AudioParameter.vue b/src/components/Talk/AudioParameter.vue
similarity index 100%
rename from src/components/AudioParameter.vue
rename to src/components/Talk/AudioParameter.vue
diff --git a/src/components/CharacterPortrait.vue b/src/components/Talk/CharacterPortrait.vue
similarity index 100%
rename from src/components/CharacterPortrait.vue
rename to src/components/Talk/CharacterPortrait.vue
diff --git a/src/views/EditorHome.vue b/src/components/Talk/EditorHome.vue
similarity index 99%
rename from src/views/EditorHome.vue
rename to src/components/Talk/EditorHome.vue
index bc6342cbfb..5b83881a49 100644
--- a/src/views/EditorHome.vue
+++ b/src/components/Talk/EditorHome.vue
@@ -188,17 +188,17 @@ import { computed, onBeforeUpdate, onMounted, ref, VNodeRef, watch } from "vue";
 import draggable from "vuedraggable";
 import { QResizeObserver } from "quasar";
 import cloneDeep from "clone-deep";
+import AudioCell from "./AudioCell.vue";
+import AudioDetail from "./AudioDetail.vue";
+import AudioInfo from "./AudioInfo.vue";
+import CharacterPortrait from "./CharacterPortrait.vue";
 import { useStore } from "@/store";
 import HeaderBar from "@/components/HeaderBar.vue";
-import AudioCell from "@/components/AudioCell.vue";
-import AudioDetail from "@/components/AudioDetail.vue";
-import AudioInfo from "@/components/AudioInfo.vue";
 import MenuBar from "@/components/Talk/MenuBar.vue";
 import HelpDialog from "@/components/help/HelpDialog.vue";
 import SettingDialog from "@/components/SettingDialog.vue";
 import HotkeySettingDialog from "@/components/HotkeySettingDialog.vue";
 import HeaderBarCustomDialog from "@/components/HeaderBarCustomDialog.vue";
-import CharacterPortrait from "@/components/CharacterPortrait.vue";
 import DefaultStyleListDialog from "@/components/DefaultStyleListDialog.vue";
 import CharacterOrderDialog from "@/components/CharacterOrderDialog.vue";
 import AcceptRetrieveTelemetryDialog from "@/components/AcceptRetrieveTelemetryDialog.vue";
diff --git a/src/router/index.ts b/src/router/index.ts
index c1ebc2228b..3f469e8d54 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,6 +1,6 @@
 import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
 import SingerHome from "../views/SingerHome.vue";
-import EditorHome from "../views/EditorHome.vue";
+import EditorHome from "@/components/Talk/EditorHome.vue";
 
 const routes: Array<RouteRecordRaw> = [
   {