Skip to content

Commit 2e20854

Browse files
authored
[release-0.17] hotfix: プロジェクトファイル読み込みと声量・音域パラメータの初期化バグ修正 (#1927)
* ロジェクトファイル読み込みと声量・音域パラメータの初期化バグ修正 * ワークアラウンド追加
1 parent 6a98b2c commit 2e20854

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed

src/components/Sing/SingEditor.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ onetimeWatch(
8989
notes: [],
9090
},
9191
});
92+
93+
// CI上のe2eテストのNemoエンジンには歌手がいないためエラーになるのでワークアラウンド
94+
// FIXME: 歌手をいると見せかけるmock APIを作り、ここのtry catchを削除する
95+
try {
96+
await store.dispatch("SET_SINGER", {});
97+
} catch (e) {
98+
window.backend.logError(e);
99+
}
92100
}
93101
94102
await store.dispatch("SET_VOLUME", { volume: 0.6 });
@@ -101,8 +109,6 @@ onetimeWatch(
101109
});
102110
isCompletedInitialStartup.value = true;
103111
104-
await store.dispatch("SET_SINGER", {});
105-
106112
return "unwatch";
107113
},
108114
{

src/components/Sing/ToolBar.vue

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
<script setup lang="ts">
135135
import { computed, watch, ref, onMounted, onUnmounted } from "vue";
136136
import { useStore } from "@/store";
137-
import { isProduction } from "@/type/preload";
138137
139138
import {
140139
getSnapTypes,
@@ -214,7 +213,7 @@ watch(
214213
() => {
215214
bpmInputBuffer.value = tempos.value[0].bpm;
216215
},
217-
{ deep: true }
216+
{ deep: true, immediate: true }
218217
);
219218
220219
watch(
@@ -223,16 +222,24 @@ watch(
223222
beatsInputBuffer.value = timeSignatures.value[0].beats;
224223
beatTypeInputBuffer.value = timeSignatures.value[0].beatType;
225224
},
226-
{ deep: true }
225+
{ deep: true, immediate: true }
227226
);
228227
229-
watch(keyRangeAdjustment, () => {
230-
keyRangeAdjustmentInputBuffer.value = keyRangeAdjustment.value;
231-
});
228+
watch(
229+
keyRangeAdjustment,
230+
() => {
231+
keyRangeAdjustmentInputBuffer.value = keyRangeAdjustment.value;
232+
},
233+
{ immediate: true }
234+
);
232235
233-
watch(volumeRangeAdjustment, () => {
234-
volumeRangeAdjustmentInputBuffer.value = volumeRangeAdjustment.value;
235-
});
236+
watch(
237+
volumeRangeAdjustment,
238+
() => {
239+
volumeRangeAdjustmentInputBuffer.value = volumeRangeAdjustment.value;
240+
},
241+
{ immediate: true }
242+
);
236243
237244
const setBpmInputBuffer = (bpmStr: string | number | null) => {
238245
const bpmValue = Number(bpmStr);

src/store/project.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ const applySongProjectToStore = async (
114114
await dispatch("SET_KEY_RANGE_ADJUSTMENT", {
115115
keyRangeAdjustment: tracks[0].keyRangeAdjustment,
116116
});
117+
await dispatch("SET_VOLUME_RANGE_ADJUSTMENT", {
118+
volumeRangeAdjustment: tracks[0].volumeRangeAdjustment,
119+
});
117120
await dispatch("SET_SCORE", {
118121
score: {
119122
tpqn,

0 commit comments

Comments
 (0)