Update gui.py (#338)
This commit is contained in:
parent
e0813eb282
commit
039e7afb85
18
gui.py
18
gui.py
@ -14,9 +14,9 @@ import os, sys, traceback
|
|||||||
|
|
||||||
now_dir = os.getcwd()
|
now_dir = os.getcwd()
|
||||||
sys.path.append(now_dir)
|
sys.path.append(now_dir)
|
||||||
from config import Config
|
from config import Config as MyConfig
|
||||||
|
|
||||||
is_half = Config().is_half
|
is_half = MyConfig().is_half
|
||||||
import PySimpleGUI as sg
|
import PySimpleGUI as sg
|
||||||
import sounddevice as sd
|
import sounddevice as sd
|
||||||
import noisereduce as nr
|
import noisereduce as nr
|
||||||
@ -48,6 +48,7 @@ class RVC:
|
|||||||
初始化
|
初始化
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
|
self.config = MyConfig()
|
||||||
self.f0_up_key = key
|
self.f0_up_key = key
|
||||||
self.time_step = 160 / 16000 * 1000
|
self.time_step = 160 / 16000 * 1000
|
||||||
self.f0_min = 50
|
self.f0_min = 50
|
||||||
@ -80,17 +81,18 @@ class RVC:
|
|||||||
cpt["config"][-3] = cpt["weight"]["emb_g.weight"].shape[0] # n_spk
|
cpt["config"][-3] = cpt["weight"]["emb_g.weight"].shape[0] # n_spk
|
||||||
self.if_f0 = cpt.get("f0", 1)
|
self.if_f0 = cpt.get("f0", 1)
|
||||||
self.version = cpt.get("version", "v1")
|
self.version = cpt.get("version", "v1")
|
||||||
if version == "v1":
|
|
||||||
if if_f0 == 1:
|
if self.version == "v1":
|
||||||
|
if self.if_f0 == 1:
|
||||||
self.net_g = SynthesizerTrnMs256NSFsid(
|
self.net_g = SynthesizerTrnMs256NSFsid(
|
||||||
*cpt["config"], is_half=config.is_half
|
*cpt["config"], is_half=self.config.is_half
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
self.net_g = SynthesizerTrnMs256NSFsid_nono(*cpt["config"])
|
self.net_g = SynthesizerTrnMs256NSFsid_nono(*cpt["config"])
|
||||||
elif version == "v2":
|
elif self.version == "v2":
|
||||||
if if_f0 == 1:
|
if self.if_f0 == 1:
|
||||||
self.net_g = SynthesizerTrnMs768NSFsid(
|
self.net_g = SynthesizerTrnMs768NSFsid(
|
||||||
*cpt["config"], is_half=config.is_half
|
*cpt["config"], is_half=self.config.is_half
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
self.net_g = SynthesizerTrnMs768NSFsid_nono(*cpt["config"])
|
self.net_g = SynthesizerTrnMs768NSFsid_nono(*cpt["config"])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user