l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/pulsectl] figure out default devices

Browse source 
make sure the modules always refer to the default devices
This commit is contained in:
tobi-wan-kenobi 2022-09-09 21:40:03 +02:00
parent a1d94d4355
commit 003a6efc8e
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bumblebee_status/modules/core/pulsectl.py
View file

@ -50,12 +50,12 @@ class Module(core.module.Module):
def toggle_mute(self, _): def toggle_mute(self, _):
with pulsectl.Pulse(self.id + "vol") as pulse: with pulsectl.Pulse(self.id + "vol") as pulse:
dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1] dev = self.get_device(pulse)
pulse.mute(dev, not self.__muted) pulse.mute(dev, not self.__muted)
def change_volume(self, amount): def change_volume(self, amount):
with pulsectl.Pulse(self.id + "vol") as pulse: with pulsectl.Pulse(self.id + "vol") as pulse:
dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1] dev = self.get_device(pulse)
vol = dev.volume vol = dev.volume
vol.value_flat += amount vol.value_flat += amount
pulse.volume_set(dev, vol) pulse.volume_set(dev, vol)
@ -66,9 +66,20 @@ class Module(core.module.Module):
def decrease_volume(self, _): def decrease_volume(self, _):
self.change_volume(-self.__change/100.0) self.change_volume(-self.__change/100.0)
def get_device(self, pulse):
devs = pulse.sink_list() if self.__type == "sink" else pulse.source_list()
default = pulse.server_info().default_sink_name if self.__type == "sink" else pulse.server_info().default_source_name
for dev in devs:
if dev.name == default:
return dev
return devs[0] # fallback
def process(self, _): def process(self, _):
with pulsectl.Pulse(self.id + "proc") as pulse: with pulsectl.Pulse(self.id + "proc") as pulse:
dev = pulse.sink_list()[0] if self.__type == "sink" else pulse.source_list()[1] dev = self.get_device(pulse)
self.__volume = dev.volume.value_flat self.__volume = dev.volume.value_flat
self.__muted = dev.mute self.__muted = dev.mute
core.event.trigger("update", [self.id], redraw_only=True) core.event.trigger("update", [self.id], redraw_only=True)