bugfix: for win exe

2025-02-02 16:23:58 +03:00 · 2023-02-12 22:14:34 +09:00 · 2023-02-12 22:14:34 +09:00 · 83646c130b
commit 83646c130b
parent 17ac07e263
11 changed files with 56 additions and 627 deletions
--- a/client/demo/dist/index.html
+++ b/client/demo/dist/index.html
@ -1,10 +1 @@
-<!DOCTYPE html>
-<html style="width: 100%; height: 100%; overflow: hidden">
-    <head>
-        <meta charset="utf-8" />
-        <title>Voice Changer Client Demo</title>
-    <script defer src="index.js"></script></head>
-    <body style="width: 100%; height: 100%; margin: 0px">
-        <div id="app" style="width: 100%; height: 100%"></div>
-    </body>
-</html>
+<!doctype html><html style="width:100%;height:100%;overflow:hidden"><head><meta charset="utf-8"/><title>Voice Changer Client Demo</title><script defer="defer" src="index.js"></script></head><body style="width:100%;height:100%;margin:0"><div id="app" style="width:100%;height:100%"></div></body></html>
--- a/client/demo/dist/index.js
+++ b/client/demo/dist/index.js
--- a/client/demo/dist/index.js.LICENSE.txt
+++ b/client/demo/dist/index.js.LICENSE.txt
@ -0,0 +1,31 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
--- a/client/demo/package-lock.json
+++ b/client/demo/package-lock.json
@ -9,7 +9,7 @@
            "version": "1.0.0",
            "license": "ISC",
            "dependencies": {
-                "@dannadori/voice-changer-client-js": "^1.0.67",
+                "@dannadori/voice-changer-client-js": "^1.0.68",
                "react": "^18.2.0",
                "react-dom": "^18.2.0"
            },
@ -3211,9 +3211,9 @@
            }
        },
        "node_modules/@dannadori/voice-changer-client-js": {
-            "version": "1.0.67",
-            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.67.tgz",
-            "integrity": "sha512-PsxNpaKpKuJfwZSWJBhtaEb0q8E+IgM9V9fYGSAUWbhLq9eVlDxjKa4xZHEQZrAJk06XxBNe2rUZp4f3MvQusQ==",
+            "version": "1.0.68",
+            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.68.tgz",
+            "integrity": "sha512-fVObPH5/bKTSi8ZqsYgTRmphgpShOkmuaDgBS87PAnO3AunvlKTcNn6kmmEoDpdarmdy7ih5g/qzRbQCQh1Rtg==",
            "dependencies": {
                "@types/readable-stream": "^2.3.15",
                "amazon-chime-sdk-js": "^3.10.0",
@ -13543,9 +13543,9 @@
            }
        },
        "@dannadori/voice-changer-client-js": {
-            "version": "1.0.67",
-            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.67.tgz",
-            "integrity": "sha512-PsxNpaKpKuJfwZSWJBhtaEb0q8E+IgM9V9fYGSAUWbhLq9eVlDxjKa4xZHEQZrAJk06XxBNe2rUZp4f3MvQusQ==",
+            "version": "1.0.68",
+            "resolved": "https://registry.npmjs.org/@dannadori/voice-changer-client-js/-/voice-changer-client-js-1.0.68.tgz",
+            "integrity": "sha512-fVObPH5/bKTSi8ZqsYgTRmphgpShOkmuaDgBS87PAnO3AunvlKTcNn6kmmEoDpdarmdy7ih5g/qzRbQCQh1Rtg==",
            "requires": {
                "@types/readable-stream": "^2.3.15",
                "amazon-chime-sdk-js": "^3.10.0",
--- a/client/demo/package.json
+++ b/client/demo/package.json
@ -50,7 +50,7 @@
        "webpack-dev-server": "^4.11.1"
    },
    "dependencies": {
-        "@dannadori/voice-changer-client-js": "^1.0.67",
+        "@dannadori/voice-changer-client-js": "^1.0.68",
        "react": "^18.2.0",
        "react-dom": "^18.2.0"
    }
--- a/client/demo/src/101_server_setting.tsx
+++ b/client/demo/src/101_server_setting.tsx
@ -90,7 +90,7 @@ export const useServerSettingArea = (props: UseServerSettingProps): ServerSettin
        const configFilenameText = props.clientState.serverSetting.fileUploadSetting.configFile?.filename || props.clientState.serverSetting.fileUploadSetting.configFile?.file?.name || ""
        const onnxModelFilenameText = props.clientState.serverSetting.fileUploadSetting.onnxModel?.filename || props.clientState.serverSetting.fileUploadSetting.onnxModel?.file?.name || ""
        const pyTorchFilenameText = props.clientState.serverSetting.fileUploadSetting.pyTorchModel?.filename || props.clientState.serverSetting.fileUploadSetting.pyTorchModel?.file?.name || ""
-        const correspondenceFileText = JSON.stringify(props.clientState.clientSetting.setting.correspondences.map(x => { return x.dirname }))
+        const correspondenceFileText = props.clientState.clientSetting.setting.correspondences ? JSON.stringify(props.clientState.clientSetting.setting.correspondences.map(x => { return x.dirname })) : ""

        return (
            <>
--- a/client/demo/src/103_speaker_setting.tsx
+++ b/client/demo/src/103_speaker_setting.tsx
@ -10,7 +10,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
    const [editSpeakerTargetName, setEditSpeakerTargetName] = useState<string>("")

    const srcIdRow = useMemo(() => {
-        const selected = props.clientState.clientSetting.setting.correspondences.find(x => {
+        const selected = props.clientState.clientSetting.setting.correspondences?.find(x => {
            return x.sid == props.clientState.serverSetting.setting.srcId
        })
        return (
@ -24,7 +24,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
                            // props.clientState.clientSetting.setting.speakers.map(x => {
                            //     return <option key={x.id} value={x.id}>{x.name}({x.id})</option>
                            // })
-                            props.clientState.clientSetting.setting.correspondences.map(x => {
+                            props.clientState.clientSetting.setting.correspondences?.map(x => {
                                return <option key={x.sid} value={x.sid}>{x.dirname}({x.sid})</option>
                            })

@ -40,7 +40,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
    }, [props.clientState.clientSetting.setting.speakers, props.clientState.serverSetting.setting.srcId, props.clientState.clientSetting.setting.correspondences, props.clientState.serverSetting.setSrcId])

    const dstIdRow = useMemo(() => {
-        const selected = props.clientState.clientSetting.setting.correspondences.find(x => {
+        const selected = props.clientState.clientSetting.setting.correspondences?.find(x => {
            return x.sid == props.clientState.serverSetting.setting.dstId
        })
        return (
@ -54,7 +54,7 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {
                            // props.clientState.clientSetting.setting.speakers.map(x => {
                            //     return <option key={x.id} value={x.id}>{x.name}({x.id})</option>
                            // })
-                            props.clientState.clientSetting.setting.correspondences.map(x => {
+                            props.clientState.clientSetting.setting.correspondences?.map(x => {
                                return <option key={x.sid} value={x.sid}>{x.dirname}({x.sid})</option>
                            })
                        }
@ -116,10 +116,10 @@ export const useSpeakerSetting = (props: UseSpeakerSettingProps) => {


    const f0FactorRow = useMemo(() => {
-        const src = props.clientState.clientSetting.setting.correspondences.find(x => {
+        const src = props.clientState.clientSetting.setting.correspondences?.find(x => {
            return x.sid == props.clientState.serverSetting.setting.srcId
        })
-        const dst = props.clientState.clientSetting.setting.correspondences.find(x => {
+        const dst = props.clientState.clientSetting.setting.correspondences?.find(x => {
            return x.sid == props.clientState.serverSetting.setting.dstId
        })

--- a/client/lib/package-lock.json
+++ b/client/lib/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "@dannadori/voice-changer-client-js",
-  "version": "1.0.67",
+  "version": "1.0.68",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@dannadori/voice-changer-client-js",
-      "version": "1.0.67",
+      "version": "1.0.68",
      "license": "ISC",
      "dependencies": {
        "@types/readable-stream": "^2.3.15",
--- a/client/lib/package.json
+++ b/client/lib/package.json
@ -1,6 +1,6 @@
 {
  "name": "@dannadori/voice-changer-client-js",
-  "version": "1.0.67",
+  "version": "1.0.68",
  "description": "",
  "main": "dist/index.js",
  "directories": {
--- a/client/lib/src/const.ts
+++ b/client/lib/src/const.ts
@ -141,14 +141,14 @@ export type ServerSettingKey = typeof ServerSettingKey[keyof typeof ServerSettin
 export const DefaultVoiceChangerServerSetting: VoiceChangerServerSetting = {
    convertChunkNum: 32, //（★１）
    minConvertSize: 0,
-    srcId: 107,
-    dstId: 100,
+    srcId: 0,
+    dstId: 101,
    gpu: 0,
    crossFadeLowerValue: 0.1,
    crossFadeOffsetRate: 0.1,
    crossFadeEndRate: 0.9,
    crossFadeOverlapRate: 0.5,
-    framework: "ONNX",
+    framework: "PyTorch",
    f0Factor: 1.0,
    onnxExecutionProvider: "CPUExecutionProvider"

--- a/server/voice_changer/VoiceChanger.py
+++ b/server/voice_changer/VoiceChanger.py
@ -82,7 +82,7 @@ class VocieChangerSettings():
    crossFadeOverlapRate: float = 0.9
    convertChunkNum: int = 32
    minConvertSize: int = 0
-    framework: str = "ONNX"  # PyTorch or ONNX
+    framework: str = "PyTorch"  # PyTorch or ONNX
    f0Factor: float = 1.0

    pyTorchModelFile: str = ""