merge 0.17.2 (#1931)

## 内容バージョン0.17.2をmainブランチにマージします。 ## その他
VOICEVOX · Mar 10, 2024 · 6ef995b · 6ef995b
2 parents 39b93bc + e7bf035
commit 6ef995b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/public/updateInfos.json b/public/updateInfos.json
@@ -1,4 +1,11 @@
 [
+  {
+    "version": "0.17.2",
+    "descriptions": [
+      "プロジェクト読み込み時に声量調整などが反映されない問題を解決"
+    ],
+    "contributors": ["Hiroshiba"]
+  },
   {
     "version": "0.17.1",
     "descriptions": [

diff --git a/src/components/Sing/SingEditor.vue b/src/components/Sing/SingEditor.vue
@@ -89,6 +89,14 @@ onetimeWatch(
           notes: [],
         },
       });
+
+      // CI上のe2eテストのNemoエンジンには歌手がいないためエラーになるのでワークアラウンド
+      // FIXME: 歌手をいると見せかけるmock APIを作り、ここのtry catchを削除する
+      try {
+        await store.dispatch("SET_SINGER", {});
+      } catch (e) {
+        window.backend.logError(e);
+      }
     }
 
     await store.dispatch("SET_VOLUME", { volume: 0.6 });
@@ -101,8 +109,6 @@ onetimeWatch(
     });
     isCompletedInitialStartup.value = true;
 
-    await store.dispatch("SET_SINGER", {});
-
     return "unwatch";
   },
   {

diff --git a/src/components/Sing/ToolBar.vue b/src/components/Sing/ToolBar.vue
@@ -134,7 +134,6 @@
 <script setup lang="ts">
 import { computed, watch, ref, onMounted, onUnmounted } from "vue";
 import { useStore } from "@/store";
-import { isProduction } from "@/type/preload";
 
 import {
   getSnapTypes,
@@ -214,7 +213,7 @@ watch(
   () => {
     bpmInputBuffer.value = tempos.value[0].bpm;
   },
-  { deep: true }
+  { deep: true, immediate: true }
 );
 
 watch(
@@ -223,16 +222,24 @@ watch(
     beatsInputBuffer.value = timeSignatures.value[0].beats;
     beatTypeInputBuffer.value = timeSignatures.value[0].beatType;
   },
-  { deep: true }
+  { deep: true, immediate: true }
 );
 
-watch(keyRangeAdjustment, () => {
-  keyRangeAdjustmentInputBuffer.value = keyRangeAdjustment.value;
-});
+watch(
+  keyRangeAdjustment,
+  () => {
+    keyRangeAdjustmentInputBuffer.value = keyRangeAdjustment.value;
+  },
+  { immediate: true }
+);
 
-watch(volumeRangeAdjustment, () => {
-  volumeRangeAdjustmentInputBuffer.value = volumeRangeAdjustment.value;
-});
+watch(
+  volumeRangeAdjustment,
+  () => {
+    volumeRangeAdjustmentInputBuffer.value = volumeRangeAdjustment.value;
+  },
+  { immediate: true }
+);
 
 const setBpmInputBuffer = (bpmStr: string | number | null) => {
   const bpmValue = Number(bpmStr);

diff --git a/src/store/project.ts b/src/store/project.ts
@@ -114,6 +114,9 @@ const applySongProjectToStore = async (
   await dispatch("SET_KEY_RANGE_ADJUSTMENT", {
     keyRangeAdjustment: tracks[0].keyRangeAdjustment,
   });
+  await dispatch("SET_VOLUME_RANGE_ADJUSTMENT", {
+    volumeRangeAdjustment: tracks[0].volumeRangeAdjustment,
+  });
   await dispatch("SET_SCORE", {
     score: {
       tpqn,