Skip to content

fix: handle missing realtime audio defaults #2808

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.

Sign up for GitHub

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

Open
nkgotcode wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle missing realtime audio defaults #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 23 additions & 5 deletions api_231006.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,42 @@ def __init__(self) -> None:
self.delay_time = 0
self.rvc = None # Initialize RVC object as None

def get_default_device(self, devices, device_indices, default_device):
if default_device in device_indices:
return devices[device_indices.index(default_device)]
return devices[0] if devices else ""

def load(self):
input_devices, output_devices, _, _ = self.get_devices()
(
input_devices,
output_devices,
input_device_indices,
output_device_indices,
) = self.get_devices()
try:
with open("configs/config.json", "r", encoding='utf-8') as j:
data = json.load(j)
data["rmvpe"] = True # Ensure rmvpe is the only f0method
if data["sg_input_device"] not in input_devices:
data["sg_input_device"] = input_devices[sd.default.device[0]]
data["sg_input_device"] = self.get_default_device(
input_devices, input_device_indices, sd.default.device[0]
)
if data["sg_output_device"] not in output_devices:
data["sg_output_device"] = output_devices[sd.default.device[1]]
data["sg_output_device"] = self.get_default_device(
output_devices, output_device_indices, sd.default.device[1]
)
except Exception as e:
logger.error(f"Failed to load configuration: {e}")
with open("configs/config.json", "w", encoding='utf-8') as j:
data = {
"pth_path": " ",
"index_path": " ",
"sg_input_device": input_devices[sd.default.device[0]],
"sg_output_device": output_devices[sd.default.device[1]],
"sg_input_device": self.get_default_device(
input_devices, input_device_indices, sd.default.device[0]
),
"sg_output_device": self.get_default_device(
output_devices, output_device_indices, sd.default.device[1]
),
"threhold": "-60",
"pitch": "0",
"index_rate": "0",
Expand Down
28 changes: 23 additions & 5 deletions api_240604.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,23 +107,41 @@ def initialize_queues(self):
p.daemon = True
p.start()

def get_default_device(self, devices, device_indices, default_device):
if default_device in device_indices:
return devices[device_indices.index(default_device)]
return devices[0] if devices else ""

def load(self):
input_devices, output_devices, _, _ = self.get_devices()
(
input_devices,
output_devices,
input_device_indices,
output_device_indices,
) = self.get_devices()
try:
with open("configs/config.json", "r", encoding='utf-8') as j:
data = json.load(j)
if data["sg_input_device"] not in input_devices:
data["sg_input_device"] = input_devices[sd.default.device[0]]
data["sg_input_device"] = self.get_default_device(
input_devices, input_device_indices, sd.default.device[0]
)
if data["sg_output_device"] not in output_devices:
data["sg_output_device"] = output_devices[sd.default.device[1]]
data["sg_output_device"] = self.get_default_device(
output_devices, output_device_indices, sd.default.device[1]
)
except Exception as e:
logger.error(f"Failed to load configuration: {e}")
with open("configs/config.json", "w", encoding='utf-8') as j:
data = {
"pth_path": "",
"index_path": "",
"sg_input_device": input_devices[sd.default.device[0]],
"sg_output_device": output_devices[sd.default.device[1]],
"sg_input_device": self.get_default_device(
input_devices, input_device_indices, sd.default.device[0]
),
"sg_output_device": self.get_default_device(
output_devices, output_device_indices, sd.default.device[1]
),
"threhold": -60,
"pitch": 0,
"formant": 0.0,
Expand Down
38 changes: 20 additions & 18 deletions gui_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,20 @@ def __init__(self) -> None:
self.update_devices()
self.launcher()

def get_default_input_device(self):
if sd.default.device[0] in self.input_devices_indices:
return self.input_devices[
self.input_devices_indices.index(sd.default.device[0])
]
return self.input_devices[0]

def get_default_output_device(self):
if sd.default.device[1] in self.output_devices_indices:
return self.output_devices[
self.output_devices_indices.index(sd.default.device[1])
]
return self.output_devices[0]

def load(self):
try:
if not os.path.exists("configs/inuse/config.json"):
Expand All @@ -170,33 +184,21 @@ def load(self):
):
self.update_devices()
data["sg_hostapi"] = self.hostapis[0]
data["sg_input_device"] = self.input_devices[
self.input_devices_indices.index(sd.default.device[0])
]
data["sg_output_device"] = self.output_devices[
self.output_devices_indices.index(sd.default.device[1])
]
data["sg_input_device"] = self.get_default_input_device()
data["sg_output_device"] = self.get_default_output_device()
else:
data["sg_hostapi"] = self.hostapis[0]
data["sg_input_device"] = self.input_devices[
self.input_devices_indices.index(sd.default.device[0])
]
data["sg_output_device"] = self.output_devices[
self.output_devices_indices.index(sd.default.device[1])
]
data["sg_input_device"] = self.get_default_input_device()
data["sg_output_device"] = self.get_default_output_device()
except:
with open("configs/inuse/config.json", "w") as j:
data = {
"pth_path": "",
"index_path": "",
"sg_hostapi": self.hostapis[0],
"sg_wasapi_exclusive": False,
"sg_input_device": self.input_devices[
self.input_devices_indices.index(sd.default.device[0])
],
"sg_output_device": self.output_devices[
self.output_devices_indices.index(sd.default.device[1])
],
"sg_input_device": self.get_default_input_device(),
"sg_output_device": self.get_default_output_device(),
"sr_type": "sr_model",
"threhold": -60,
"pitch": 0,
Expand Down