From d0224a5e5066b1b0be7e424e53176f077c9f544b Mon Sep 17 00:00:00 2001
From: nadare <1na2da0re3@gmail.com>
Date: Tue, 4 Jul 2023 06:50:58 +0900
Subject: [PATCH] =?UTF-8?q?speaker=E3=81=AE=E8=87=AA=E5=8B=95=E6=A4=9C?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/voice_changer/RVC/RVC.py                   | 2 +-
 server/voice_changer/RVC/RVCModelSlotGenerator.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/voice_changer/RVC/RVC.py b/server/voice_changer/RVC/RVC.py
index 884663d5..a59d535a 100644
--- a/server/voice_changer/RVC/RVC.py
+++ b/server/voice_changer/RVC/RVC.py
@@ -144,7 +144,7 @@ class RVC(VoiceChangerModel):
 
         audio = torchaudio.functional.resample(audio, self.slotInfo.samplingRate, 16000, rolloff=0.99)
         repeat = 1 if self.settings.rvcQuality else 0
-        sid = 0
+        sid = self.settings.dstId
         f0_up_key = self.settings.tran
         index_rate = self.settings.indexRatio
         protect = self.settings.protect
diff --git a/server/voice_changer/RVC/RVCModelSlotGenerator.py b/server/voice_changer/RVC/RVCModelSlotGenerator.py
index d5cd536c..1699a296 100644
--- a/server/voice_changer/RVC/RVCModelSlotGenerator.py
+++ b/server/voice_changer/RVC/RVCModelSlotGenerator.py
@@ -100,6 +100,10 @@ class RVCModelSlotGenerator(ModelSlotGenerator):
             if slot.embedder.endswith("768"):
                 slot.embedder = slot.embedder[:-3]
 
+            if "speaker_info" in cpt.keys():
+                for k, v in cpt["speaker_info"].items():
+                    slot.speakers[int(k)] = str(v)
+
             # if slot.embedder == EnumEmbedderTypes.hubert.value:
             #     slot.embedder = EnumEmbedderTypes.hubert
             # elif slot.embedder == EnumEmbedderTypes.contentvec.value: