Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.15] to 0.15.0 #1731

Merged
merged 7 commits into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ VITE_DEFAULT_ENGINE_INFOS=`[
"uuid": "074fc39e-678b-4c13-8916-ffca8d505d1d",
"name": "VOICEVOX Engine",
"executionEnabled": true,
"executionFilePath": "vv-engine/run.exe",
"executionFilePath": "run.exe",
"executionArgs": [],
"host": "http://127.0.0.1:50021"
}
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ on:

env:
VOICEVOX_ENGINE_REPO_URL: "https://github.com/VOICEVOX/voicevox_engine"
VOICEVOX_ENGINE_VERSION: 0.14.7
VOICEVOX_RESOURCE_VERSION: 0.15.0-preview.3
VOICEVOX_ENGINE_VERSION: 0.15.0
VOICEVOX_RESOURCE_VERSION: 0.15.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ちょっとややこしいことをしてしまったのですが、エディタだけリソース0.15.0になっていて、エンジン側は0.14のままになってしまいました。
(エディターにだけ必要だったリソースのアップデートに気づいてなかったためです)

0.16のアップデートがすぐあって、それまでリソースのアップデート(キャラ追加など)はないはずなので大丈夫なはずではあるのですが、一応共有です。

VOICEVOX_EDITOR_VERSION:
|- # releaseタグ名か、workflow_dispatchでのバージョン名か、999.999.999-developが入る
${{ github.event.release.tag_name || github.event.inputs.version || '999.999.999-develop' }}
Expand Down Expand Up @@ -278,24 +278,26 @@ jobs:
- name: Merge VOICEVOX ENGINE into prepackage/
if: startsWith(matrix.artifact_name, 'windows-') || startsWith(matrix.artifact_name, 'linux-')
run: |
mv voicevox_engine/ prepackage/vv-engine/
mv voicevox_engine/* prepackage/
rm -rf voicevox_engine

- name: Merge VOICEVOX ENGINE into prepackage/VOICEVOX.app/Contents/MacOS/
if: startsWith(matrix.artifact_name, 'macos-')
run: |
mv voicevox_engine/ prepackage/VOICEVOX.app/Contents/MacOS/vv-engine/
mv voicevox_engine/* prepackage/VOICEVOX.app/Contents/MacOS/
rm -rf voicevox_engine

- name: Recover file permissions
if: startsWith(matrix.artifact_name, 'linux-') # linux
run: |
chmod +x "prepackage/${{ matrix.linux_executable_name }}"
chmod +x "prepackage/vv-engine/run"
chmod +x "prepackage/run"

- name: Recover file permissions for macOS build
if: startsWith(matrix.artifact_name, 'macos-') # macOS
run: |
chmod +x "prepackage/VOICEVOX.app/Contents/MacOS/${{ matrix.macos_executable_name }}"
chmod +x "prepackage/VOICEVOX.app/Contents/MacOS/vv-engine/run"
chmod +x "prepackage/VOICEVOX.app/Contents/MacOS/run"
chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper (GPU).app/Contents/MacOS/VOICEVOX Helper (GPU)"
chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper (Plugin).app/Contents/MacOS/VOICEVOX Helper (Plugin)"
chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper (Renderer).app/Contents/MacOS/VOICEVOX Helper (Renderer)"
Expand Down
4 changes: 2 additions & 2 deletions electron-builder.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const dotenvPath = path.join(process.cwd(), ".env.production");
dotenv.config({ path: dotenvPath });

const VOICEVOX_ENGINE_DIR =
process.env.VOICEVOX_ENGINE_DIR ?? "../voicevox_engine/dist/run/";
process.env.VOICEVOX_ENGINE_DIR ?? "../voicevox_engine/run.dist/";

// ${productName} Web Setup ${version}.${ext}
const NSIS_WEB_ARTIFACT_NAME = process.env.NSIS_WEB_ARTIFACT_NAME;
Expand Down Expand Up @@ -90,7 +90,7 @@ const builderOptions = {
},
{
from: VOICEVOX_ENGINE_DIR,
to: path.join(extraFilePrefix, "vv-engine"),
to: extraFilePrefix,
},
{
from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile),
Expand Down
2 changes: 1 addition & 1 deletion public/howtouse.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ GPU をお持ちの方は、音声の生成がずっと速い GPU モードを

画面の右の欄で、テキスト欄ごとに話速や抑揚などのパラメータを変更することができます。

<img src="res/image24.png" style="max-height: 12rem" alt="「イントネーション」をクリックして現れる縦線のバー"/>
<img src="res/image24.png" style="max-height: 12rem" alt="右側にパラメータを調整する欄が表示されています。"/>

- 話速
- 読み上げ速度を変更できます。数値が大きいほど速くなります。
Expand Down
4 changes: 4 additions & 0 deletions public/qAndA.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ DirectML 対応の GPU を搭載した Windows PC と、Nvidia 製 GPU 搭載の

お使いいただけます。

### Q. 辞書をインポート/エクスポートしたいです

起動中のエンジンの設定画面で行えます。ソフトウェア起動中にブラウザから`http://127.0.0.1:[エンジンのポート番号]/setting`にアクセスするとエンジンの設定画面が開きます。エンジンのポート番号はデフォルトで`50021`です。

## 不具合・エラーに関する質問

### Q. バグを見つけました。どこに報告すれば良いですか?
Expand Down
57 changes: 57 additions & 0 deletions public/updateInfos.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,61 @@
[
{
"version": "0.15.0",
"descriptions": [
"デフォルトプリセット機能",
"最近開いたプロジェクト一覧を追加",
"行番号を表示するオプションを追加",
"自動でポートを変更するように",
"メモ機能・ルビ機能",
"テキスト追加ボタンの非表示機能",
"複数選択機能",
"アップデート通知機能",
"開発環境の向上",
"バグ修正"
],
"contributors": [
"aoirint",
"finict",
"FujisakiEx",
"g-Ratie",
"henteko",
"Hiroshiba",
"Jun-1Il",
"k-chop",
"kebin628",
"K-shir0",
"liszt01",
"madosuki",
"My-MC",
"nagi-miaow",
"nmori",
"nohimazin",
"okaits",
"raa0121",
"risu729",
"sabonerune",
"sevenc-nanashi",
"shm11C3",
"siketyan",
"sousuke0422",
"stmtk1",
"takana-v",
"tarepan",
"thiramisu",
"Tksn07",
"tomoish",
"tuna2134",
"tunamaguro",
"umi1299",
"wappon28dev",
"weweweok",
"whiteball",
"yamachu",
"y-chan",
"yncat",
"yuriko0505"
]
},
{
"version": "0.14.11",
"descriptions": [
Expand Down
19 changes: 13 additions & 6 deletions src/components/EngineManageDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -275,16 +275,23 @@
engineManifests[selectedId].supportedFeatures
"
>
<li
<template
v-for="(value, feature) in engineManifests[selectedId]
.supportedFeatures !== null
.supportedFeatures != null
? engineManifests[selectedId].supportedFeatures
: null"
:key="feature"
:class="value ? '' : 'text-warning'"
>
{{ getFeatureName(feature) }}:{{ value ? "対応" : "非対応" }}
</li>
<!-- TODO: vvlib機能がリリースされたらmanageLibraryも表示するようにする -->
<li
v-if="feature != 'manageLibrary'"
:class="value ? '' : 'text-warning'"
>
{{ getFeatureName(feature) }}:{{
value ? "対応" : "非対応"
}}
</li>
</template>
</ul>
<span v-else>(取得に失敗しました)</span>
</div>
Expand Down Expand Up @@ -461,7 +468,7 @@ const getFeatureName = (name: keyof SupportedFeatures) => {
adjustIntonationScale: "全体の抑揚の調整",
adjustVolumeScale: "全体の音量の調整",
interrogativeUpspeak: "疑問文の自動調整",
synthesisMorphing: "2人の話者でモーフィングした音声を合成",
synthesisMorphing: "2種類のスタイルでモーフィングした音声を合成",
manageLibrary: "音声ライブラリ(vvlib)の管理",
};
return featureNameMap[name];
Expand Down
1 change: 1 addition & 0 deletions src/shared/ConfigManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const migrations: [string, (store: Record<string, unknown>) => unknown][] = [
[
">=0.15",
(config) => {
// 一つだけ書き出し → 選択音声を書き出し
const hotkeySettings =
config.hotkeySettings as ConfigType["hotkeySettings"];
const newHotkeySettings: ConfigType["hotkeySettings"] =
Expand Down
Loading