From 2e20854651ac9ee977d17c5c2f635108a14e4bbb Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Sun, 10 Mar 2024 01:05:20 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[release-0.17]=20hotfix:=20=E3=83=97?=
 =?UTF-8?q?=E3=83=AD=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF=E3=81=A8?=
 =?UTF-8?q?=E5=A3=B0=E9=87=8F=E3=83=BB=E9=9F=B3=E5=9F=9F=E3=83=91=E3=83=A9?=
 =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=81=AE=E5=88=9D=E6=9C=9F=E5=8C=96?=
 =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3=20(#1927)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ロジェクトファイル読み込みと声量・音域パラメータの初期化バグ修正

* ワークアラウンド追加
---
 src/components/Sing/SingEditor.vue | 10 ++++++++--
 src/components/Sing/ToolBar.vue    | 25 ++++++++++++++++---------
 src/store/project.ts               |  3 +++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/components/Sing/SingEditor.vue b/src/components/Sing/SingEditor.vue
index 27da8b6c09..a88a2c1ad7 100644
--- 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
index 4838290011..a8a8172d64 100644
--- 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
index 096c151b2a..923c6e01c6 100755
--- 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,

From 2178b0995160c2e5d976fc4d098e5c3449a8c2f6 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Sun, 10 Mar 2024 01:14:33 +0900
Subject: [PATCH 2/3] [release-0.17] to 0.17.2 (#1929)

to 0.17.2
---
 public/updateInfos.json | 7 +++++++
 1 file changed, 7 insertions(+)

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

From e7bf035d55967c7c20a5ab9e335b2041ea01b7eb Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Sun, 10 Mar 2024 19:56:34 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[release-0.17]=200.17.2=E3=81=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=B1=A5=E6=AD=B4=E3=81=AE=E8=AA=A4=E5=AD=97=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(#1930)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

0.17.2の更新履歴の誤字修正
---
 public/updateInfos.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/updateInfos.json b/public/updateInfos.json
index ec97f04574..2a822f7c2f 100644
--- a/public/updateInfos.json
+++ b/public/updateInfos.json
@@ -2,7 +2,7 @@
   {
     "version": "0.17.2",
     "descriptions": [
-      "プロジェクト読込み時に声量調整などが反映されない問題を解決"
+      "プロジェクト読み込み時に声量調整などが反映されない問題を解決"
     ],
     "contributors": ["Hiroshiba"]
   },