[project-s] Phraseをストアで持つようにする #1663
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hiroshiba
approved these changes
Dec 3, 2023
Comment on lines
+281
to
+285
| type PhraseData = { | ||
| blob?: Blob; | ||
| source?: Instrument | AudioPlayer; // ひとまずPhraseDataに持たせる | ||
| sequence?: Sequence; // ひとまずPhraseDataに持たせる | ||
| }; |
There was a problem hiding this comment.
おそらくこのデータは、Vuex内で閉じていて他で使ってほしくない値というニュアンスなのかなと思いました！
ローカル変数の概念が無いのでそう分けられたのかなと。
となると、コメントでこの型の説明付けておくとニュアンス伝わりやすいかもです。こんな感じとか？
Suggested change
| type PhraseData = { | |
| blob?: Blob; | |
| source?: Instrument | AudioPlayer; // ひとまずPhraseDataに持たせる | |
| sequence?: Sequence; // ひとまずPhraseDataに持たせる | |
| }; | |
| // Phraseのstore内用データ | |
| type PhraseData = { | |
| blob?: Blob; | |
| source?: Instrument | AudioPlayer; // ひとまずPhraseDataに持たせる | |
| sequence?: Sequence; // ひとまずPhraseDataに持たせる | |
| }; |
Comment on lines
-297
to
289
| const allPhrases = new Map<string, Phrase>(); | ||
| const phraseDataMap = new Map<string, PhraseData>(); | ||
| const phraseAudioBlobCache = new Map<string, Blob>(); |
There was a problem hiding this comment.
PhraseDataにもblobがあって、それとは別にphraseAudioBlobCacheもあるのでちょっとややこしいかもと思いました！
Comment on lines
+1225
to
+1228
| commit("SET_AUDIO_QUERY_TO_PHRASE", { phraseKey: key, audioQuery }); | ||
|
|
||
| const startTime = calcStartTime(phrase.score, audioQuery); | ||
| commit("SET_START_TIME_TO_PHRASE", { phraseKey: key, startTime }); |
There was a problem hiding this comment.
audioQueryとstartTimeは片方が存在すればもう片方は必ず存在する気がするので、それを型に入れてあげるとundefinedチェック用のifを二回実行しなくて済むかもと思いました！
つまり、こうでも良いかも、と。
type Phrase = {
otherData?: {
audioQuery: AudioQuery,
startTime: number
}
}まあこのあたり今はどういう形が最高かわからないのですが、こういう考え方もあるよという感じで･･･！
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
内容
Phraseをストア（VuexのState）で持つようにし、ストアで持てないBlobなどはPhraseDataで持つようにします。また、以下も行います。
PhraseのstartTimeの計算をAudioQuery生成・編集時に行うようにするAudioQueryのハッシュを計算・比較する処理を一旦削除exportingAudioをnowAudioExportingに変更EXPORT_WAVE_FILEにレンダリング未完了の場合の処理が残っていたので削除関連 Issue
VOICEVOX/voicevox_project#15
その他