🐛[bugfix] Model: MicもしくはSpeakerが一つも接続されていない状態でデバイス情報を取得した場合にNoneになるように修正
This commit is contained in:
@@ -12,6 +12,8 @@ def getInputDevices():
|
||||
devices[host["name"]].append(device)
|
||||
else:
|
||||
devices[host["name"]] = [device]
|
||||
if len(devices) == 0:
|
||||
devices = {"None": [{"name": "None"}]}
|
||||
return devices
|
||||
|
||||
def getOutputDevices():
|
||||
@@ -21,6 +23,8 @@ def getOutputDevices():
|
||||
for device in p.get_loopback_device_info_generator():
|
||||
if device["hostApi"] == wasapi_info["index"] and device["isLoopbackDevice"] is True:
|
||||
devices.append(device)
|
||||
if len(devices) == 0:
|
||||
devices = [{'name':"None"}]
|
||||
return devices
|
||||
|
||||
def getDefaultInputDevice():
|
||||
@@ -33,7 +37,8 @@ def getDefaultInputDevice():
|
||||
for device_index in range(0, p. get_host_api_info_by_index(host_index)['deviceCount']):
|
||||
device = p.get_device_info_by_host_api_device_index(host_index, device_index)
|
||||
if device["index"] == defaultInputDevice:
|
||||
return {"host":host, "device": device}
|
||||
return {"host": host, "device": device}
|
||||
return {"host": {"name": "None"}, "device": {"name": "None"}}
|
||||
|
||||
def getDefaultOutputDevice():
|
||||
with PyAudio() as p:
|
||||
@@ -49,4 +54,5 @@ def getDefaultOutputDevice():
|
||||
for loopback in p.get_loopback_device_info_generator():
|
||||
if default_speakers["name"] in loopback["name"]:
|
||||
default_device = loopback
|
||||
return default_device
|
||||
return default_device
|
||||
return {"name":"None"}
|
||||
Reference in New Issue
Block a user