mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
resolve merge conflict
This commit is contained in:
parent
5acdc338ba
commit
0e28e2e3a2
|
@ -42,8 +42,8 @@ def get_audio_devices():
|
||||||
proc.start()
|
proc.start()
|
||||||
proc.join()
|
proc.join()
|
||||||
|
|
||||||
log.debug("[AUD] get_audio_devices: input_devices:", list=f"{proxy_input_devices}")
|
#log.debug("[AUD] get_audio_devices: input_devices:", list=f"{proxy_input_devices}")
|
||||||
log.debug("[AUD] get_audio_devices: output_devices:", list=f"{proxy_output_devices}")
|
#log.debug("[AUD] get_audio_devices: output_devices:", list=f"{proxy_output_devices}")
|
||||||
return list(proxy_input_devices), list(proxy_output_devices)
|
return list(proxy_input_devices), list(proxy_output_devices)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue