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

[modules/pulesaudio] Remove pacmd dependency

Browse source 
Experimentally remove dependency for pacmd to enable the pulseaudio
module to support pulseaudio daemon in system mode (according to #484).

fixes #484
This commit is contained in:
Tobias Witek 2019-12-25 13:50:46 +01:00
parent 2e26f6d0c4
commit 421f1e525b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bumblebee/modules/pulseaudio.py
View file

@ -53,9 +53,9 @@ class Module(bumblebee.engine.Module):
self._channel = "sink" if self.name == "pasink" else "source"
self._patterns = [
{"expr": "name:", "callback": (lambda line: False)},
{"expr": "muted:", "callback": (lambda line: self.mute(False if " no" in line.lower() else True))},
{"expr": "volume:", "callback": self.getvolume},
{"expr": "Name:", "callback": (lambda line: False)},
{"expr": "Mute:", "callback": (lambda line: self.mute(False if " no" in line.lower() else True))},
{"expr": "Volume:", "callback": self.getvolume},
]
engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE, cmd="pavucontrol")
@ -111,8 +111,8 @@ class Module(bumblebee.engine.Module):
return True
def _default_device(self):
output = bumblebee.util.execute("pacmd stat")
pattern = "Default sink name: " if self.name == "pasink" else "Default source name: "
output = bumblebee.util.execute("pactl info")
pattern = "Default {}: ".format("Sink" if self.name == "pasink" else "Source")
for line in output.split("\n"):
if line.startswith(pattern):
return line.replace(pattern, "")
@ -134,11 +134,11 @@ class Module(bumblebee.engine.Module):
channel = "sinks" if self.name == "pasink" else "sources"
device = self._default_device()
result = bumblebee.util.execute("pacmd list-{}".format(channel))
result = bumblebee.util.execute("pactl list {}".format(channel))
found = False
for line in result.split("\n"):
if "<"+device+">" in line:
if "Name: {}".format(device) in line:
found = True
continue
if found is False: