platypush/platypush
platypush
/
platypush
2
2
Fork 4
Code Issues 47 Pull Requests Packages Projects 4 Releases Wiki Activity

[`sound`] Better logic for default sound device auto-detection.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Fabio Manganiello 2023-10-22 18:07:25 +02:00
parent 4d582bb6bc
commit e24438980a
Signed by: blacklight
GPG Key ID: D90FBA7F76362774
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
platypush/plugins/sound/_manager/_device.py
View File

@ -51,7 +51,7 @@ class DeviceManager:
if type: if type:
devices = [dev for dev in devices if dev.get(f'max_{type.value}_channels')] devices = [dev for dev in devices if dev.get(f'max_{type.value}_channels')]
return [AudioDevice(**info) for info in devices] return [AudioDevice(index=idx, **info) for idx, info in enumerate(devices)]
def get_device( def get_device(
self, self,
@ -75,8 +75,11 @@ class DeviceManager:
if type == StreamType.OUTPUT and self.output_device is not None: if type == StreamType.OUTPUT and self.output_device is not None:
return self.output_device return self.output_device
all_devices: List[dict] = sd.query_devices() # type: ignore
assert all_devices, 'No sound devices found'
try: try:
info: dict = sd.query_devices( dev: dict = sd.query_devices(
kind=type.value if type else None, device=device # type: ignore kind=type.value if type else None, device=device # type: ignore
) )
except sd.PortAudioError as e: except sd.PortAudioError as e:
@ -87,5 +90,15 @@ class DeviceManager:
e, e,
) from e ) from e
assert info, f'No such device: {device}' if not dev:
return AudioDevice(**info) if device:
raise AssertionError(f'No such device: {device}')
if type:
raise AssertionError(f'No default device for type={type}')
idx = next(
iter(i for i, d in enumerate(all_devices) if d['name'] == dev['name']), None
)
assert idx is not None, 'Could not infer the sound device index'
return AudioDevice(index=idx, **dev)