From 89eecdceabe1654490df70518f1eb46ff6c6191c Mon Sep 17 00:00:00 2001
From: Ftps <63702646+Tps-F@users.noreply.github.com>
Date: Tue, 29 Aug 2023 16:00:24 +0900
Subject: [PATCH] fix gui_v1

---
 configs/config.json       | 15 +--------------
 gui_v1.py                 |  2 +-
 tools/rvc_for_realtime.py |  6 +++---
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/configs/config.json b/configs/config.json
index 6bf4f6b..62813e1 100644
--- a/configs/config.json
+++ b/configs/config.json
@@ -1,14 +1 @@
-{
-  "pth_path": "weights/kikiV1.pth",
-  "index_path": "logs/kikiV1.index",
-  "sg_input_device": "VoiceMeeter Output (VB-Audio Vo (MME)",
-  "sg_output_device": "VoiceMeeter Aux Input (VB-Audio (MME)",
-  "threhold": -45.0,
-  "pitch": 0.0,
-  "index_rate": 1.0,
-  "block_time": 0.09,
-  "crossfade_length": 0.15,
-  "extra_time": 5.0,
-  "n_cpu": 8.0,
-  "f0method": "rmvpe"
-}
+{"pth_path": "F:/src/Retrieval-based-Voice-Conversion-WebUI/assets/weights/Mahiro.pth", "index_path": "F:/src/Retrieval-based-Voice-Conversion-WebUI/logs/Mahiro_added_IVF94_Flat_nprobe_3.index", "sg_input_device": "Microphone (USB Advanced Audio Device) (Windows DirectSound)", "sg_output_device": "Output 1/2 (Komplete Audio 6 MK2) (Windows DirectSound)", "threhold": -45.0, "pitch": 0.0, "index_rate": 1.0, "block_time": 0.09, "crossfade_length": 0.15, "extra_time": 5.0, "n_cpu": 8.0, "f0method": "rmvpe"}
\ No newline at end of file
diff --git a/gui_v1.py b/gui_v1.py
index 5edb349..8ed0e38 100644
--- a/gui_v1.py
+++ b/gui_v1.py
@@ -139,7 +139,7 @@ if __name__ == "__main__":
                                 ),
                                 sg.FileBrowse(
                                     i18n("选择.pth文件"),
-                                    initial_folder=os.path.join(os.getcwd(), "weights"),
+                                    initial_folder=os.path.join(os.getcwd(), "assets/weights"),
                                     file_types=((". pth"),),
                                 ),
                             ],
diff --git a/tools/rvc_for_realtime.py b/tools/rvc_for_realtime.py
index 734d926..601efcb 100644
--- a/tools/rvc_for_realtime.py
+++ b/tools/rvc_for_realtime.py
@@ -70,7 +70,7 @@ class RVC:
                 print("index search enabled")
             self.index_rate = index_rate
             models, _, _ = fairseq.checkpoint_utils.load_model_ensemble_and_task(
-                ["hubert_base.pt"],
+                ["assets/hubert/hubert_base.pt"],
                 suffix="",
             )
             hubert_model = models[0]
@@ -224,14 +224,14 @@ class RVC:
 
     def get_f0_rmvpe(self, x, f0_up_key):
         if hasattr(self, "model_rmvpe") == False:
-            from lib.rmvpe import RMVPE
+            from infer.lib.rmvpe import RMVPE
 
             print("loading rmvpe model")
             self.model_rmvpe = RMVPE(
                 # "rmvpe.pt", is_half=self.is_half if self.device.type!="privateuseone" else False, device=self.device if self.device.type!="privateuseone"else "cpu"####dml时强制对rmvpe用cpu跑
                 #  "rmvpe.pt", is_half=False, device=self.device####dml配置
                 # "rmvpe.pt", is_half=False, device="cpu"####锁定cpu配置
-                "rmvpe.pt",
+                "assets/rmvpe/rmvpe.pt",
                 is_half=self.is_half,
                 device=self.device,  ####正常逻辑
             )