VOICEVOX · aoirint · Mar 8, 2022 · Mar 8, 2022 · Mar 8, 2022 · Mar 8, 2022
@@ -34,6 +34,7 @@
                 "
                 @click="
                   changeStyleId(
+                    characterInfo.metas.speakerUuid,
                     getDefaultStyle(characterInfo.metas.speakerUuid).styleId
                   )
                 "
@@ -89,7 +90,12 @@
                         v-close-popup
                         active-class="selected-character-item"
                         :active="style.styleId === selectedStyle.styleId"
-                        @click="changeStyleId(style.styleId)"
+                        @click="
+                          changeStyleId(
+                            characterInfo.metas.speakerUuid,
+                            style.styleId
+                          )
+                        "
                       >
                         <q-avatar rounded size="2rem" class="q-mr-md">
                           <q-img
@@ -160,6 +166,7 @@ import { computed, watch, defineComponent, ref } from "vue";
 import { useStore } from "@/store";
 import { AudioItem } from "@/store/type";
 import { QInput, debounce } from "quasar";
+import { getEngineIdByEngineKey } from "@/store/audio";
 
 export default defineComponent({
   name: "AudioCell",
@@ -187,11 +194,11 @@ export default defineComponent({
 
     const selectedCharacterInfo = computed(() =>
       userOrderedCharacterInfos.value !== undefined &&
+      audioItem.value.engineId !== undefined &&
       audioItem.value.styleId !== undefined
-        ? userOrderedCharacterInfos.value.find((info) =>
-            info.metas.styles.find(
-              (style) => style.styleId === audioItem.value.styleId
-            )
+        ? store.getters.CHARACTER_INFO(
+            audioItem.value.engineId,
+            audioItem.value.styleId
           )
         : undefined
     );
@@ -245,9 +252,22 @@ export default defineComponent({
       }
     };
 
-    const changeStyleId = (styleId: number) => {
+    const changeStyleId = (speakerUuid: string, styleId: number) => {
+      const engineKey = store.state.engineKeys.find((_engineKey) =>
+        (store.state.characterInfos[_engineKey] ?? []).some(
+          (characterInfo) => characterInfo.metas.speakerUuid === speakerUuid
+        )
+      );
+      if (engineKey === undefined)
+        throw new Error(
+          `No engineKey for target character style (speakerUuid == ${speakerUuid}, styleId == ${styleId})`
+        );
+
+      const engineId = getEngineIdByEngineKey(store.state, engineKey);
+
       store.dispatch("COMMAND_CHANGE_STYLE_ID", {
         audioKey: props.audioKey,
+        engineId,
         styleId,
       });
     };
@@ -305,10 +325,17 @@ export default defineComponent({
             await pushAudioText();
           }
 
+          const engineId = audioItem.value.engineId;
+          if (engineId === undefined)
+            throw new Error("assert engineId !== undefined");
+
           const styleId = audioItem.value.styleId;
-          if (styleId == undefined) throw new Error("styleId == undefined");
+          if (styleId === undefined)
+            throw new Error("assert styleId !== undefined");
+
           const audioKeys = await store.dispatch("COMMAND_PUT_TEXTS", {
             texts,
+            engineId,
             styleId,
             prevAudioKey,
           });

@@ -16,18 +16,17 @@ export default defineComponent({
     const store = useStore();
 
     const characterInfo = computed(() => {
-      const characterInfos = store.state.characterInfos || [];
       const activeAudioKey: string | undefined = store.getters.ACTIVE_AUDIO_KEY;
       const audioItem = activeAudioKey
         ? store.state.audioItems[activeAudioKey]
         : undefined;
+
+      const engineId = audioItem?.engineId;
       const styleId = audioItem?.styleId;
 
-      return styleId !== undefined
-        ? characterInfos.find((info) =>
-            info.metas.styles.find((style) => style.styleId === styleId)
-          )
-        : undefined;
+      if (engineId === undefined || styleId === undefined) return undefined;
+
+      return store.getters.CHARACTER_INFO(engineId, styleId);
     });
 
     const characterName = computed(() => {

@@ -222,6 +222,7 @@ import {
 import AudioAccent from "@/components/AudioAccent.vue";
 import { QInput, useQuasar } from "quasar";
 import { AudioItem } from "@/store/type";
+import { getEngineIdByEngineKey } from "@/store/audio";
 
 export default defineComponent({
   name: "DictionaryManageDialog",
@@ -237,6 +238,8 @@ export default defineComponent({
     const store = useStore();
     const $q = useQuasar();
 
+    const engineKeyComputed = computed(() => store.state.engineKeys[0]); // TODO: 複数エンジン対応
+
     const dictionaryManageDialogOpenedComputed = computed({
       get: () => props.modelValue,
       set: (val) => emit("update:modelValue", val),
@@ -256,10 +259,16 @@ export default defineComponent({
     };
 
     const loadingDictProcess = async () => {
+      const engineKey = engineKeyComputed.value;
+      if (engineKey === undefined)
+        throw new Error(`assert engineKey !== undefined`);
+
       loadingDict.value = true;
       try {
         userDict.value = await createUILockAction(
-          store.dispatch("LOAD_USER_DICT")
+          store.dispatch("LOAD_USER_DICT", {
+            engineKey,
+          })
         );
       } catch {
         $q.dialog({
@@ -330,6 +339,10 @@ export default defineComponent({
       surface.value = convertHankakuToZenkaku(text);
     };
     const setYomi = async (text: string, changeWord?: boolean) => {
+      const engineKey = engineKeyComputed.value;
+      if (engineKey === undefined)
+        throw new Error(`assert engineKey !== undefined`);
+
       // テキスト長が0の時にエラー表示にならないように、テキスト長を考慮する
       isOnlyHiraOrKana.value = !text.length || kanaRegex.test(text);
       // 読みが変更されていない場合は、アクセントフレーズに変更を加えない
@@ -352,6 +365,7 @@ export default defineComponent({
           await createUILockAction(
             store.dispatch("FETCH_ACCENT_PHRASES", {
               text: text + "ガ'",
+              engineKey,
               styleId: styleId.value,
               isKana: true,
             })
@@ -370,12 +384,17 @@ export default defineComponent({
     };
 
     const changeAccent = async (_: number, accent: number) => {
+      const engineKey = engineKeyComputed.value;
+      if (engineKey === undefined)
+        throw new Error(`assert engineKey !== undefined`);
+
       if (accentPhrase.value) {
         accentPhrase.value.accent = accent;
         accentPhrase.value = (
           await createUILockAction(
             store.dispatch("FETCH_MORA_DATA", {
               accentPhrases: [accentPhrase.value],
+              engineKey,
               styleId: styleId.value,
             })
           )
@@ -387,6 +406,12 @@ export default defineComponent({
     audioElem.pause();
 
     const play = async () => {
+      const engineKey = engineKeyComputed.value;
+      if (engineKey === undefined)
+        throw new Error(`assert engineKey !== undefined`);
+
+      const engineId = getEngineIdByEngineKey(store.state, engineKey);
+
       if (!accentPhrase.value) return;
       nowGenerating.value = true;
       const query: AudioQuery = {
@@ -403,6 +428,7 @@ export default defineComponent({
 
       const audioItem: AudioItem = {
         text: yomi.value,
+        engineId,
         styleId: styleId.value,
         query,
       };

@@ -39,13 +39,16 @@
 import { useStore } from "@/store";
 import { computed, defineComponent, ref } from "@vue/runtime-core";
 import { useMarkdownIt } from "@/plugins/markdownItPlugin";
+import { getFlattenCharacterInfos } from "@/store/audio";
 
 export default defineComponent({
   setup() {
     const store = useStore();
     const md = useMarkdownIt();
 
-    const characterInfos = computed(() => store.state.characterInfos);
+    const flattenCharacterInfos = computed(() =>
+      getFlattenCharacterInfos(store.state)
+    );
 
     const convertMarkdown = (text: string) => {
       return md.render(text);
@@ -62,7 +65,7 @@ export default defineComponent({
     };
 
     return {
-      characterInfos,
+      characterInfos: flattenCharacterInfos,
       convertMarkdown,
       selectCharacterInfIndex,
       detailIndex,