masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace pacmd calls with pactl to support Pipewire (#836) (#836)

Browse Source 
Co-authored-by: EgZvor <ezvor@mail.ru>
This commit is contained in:
Mathis Felardos 2023-12-01 13:55:58 +01:00 committed by GitHub
parent d4addb9e78
commit 534822077a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
i3pystatus/pulseaudio/__init__.py
View File

@ -1,4 +1,3 @@
import os
import re import re
import subprocess import subprocess
@ -46,7 +45,7 @@ class PulseAudio(Module, ColorRangeModule):
("format_muted", "optional format string to use when muted"), ("format_muted", "optional format string to use when muted"),
("format_selected", "string used to mark this sink if selected"), ("format_selected", "string used to mark this sink if selected"),
"muted", "unmuted", "muted", "unmuted",
"color_muted", "color_unmuted", "color_error", "color_muted", "color_unmuted",
("step", "percentage to increment volume on scroll"), ("step", "percentage to increment volume on scroll"),
("sink", "sink name to use, None means pulseaudio default"), ("sink", "sink name to use, None means pulseaudio default"),
("move_sink_inputs", "Move all sink inputs when we change the default sink"), ("move_sink_inputs", "Move all sink inputs when we change the default sink"),
@ -64,6 +63,7 @@ class PulseAudio(Module, ColorRangeModule):
format_selected = " 🗸" format_selected = " 🗸"
currently_muted = False currently_muted = False
has_amixer = False has_amixer = False
color_error = "#FF0000"
color_muted = "#FF0000" color_muted = "#FF0000"
color_unmuted = "#FFFFFF" color_unmuted = "#FFFFFF"
vertical_bar_glyphs = None vertical_bar_glyphs = None
@ -120,8 +120,7 @@ class PulseAudio(Module, ColorRangeModule):
if self.sink is not None: if self.sink is not None:
return self.sink return self.sink
self.sinks = subprocess.check_output(['pactl', 'list', 'short', 'sinks'], self.sinks = self._call_pactl(["list", "short", "sinks"]).splitlines()
universal_newlines=True).splitlines()
bestsink = None bestsink = None
state = 'DEFAULT' state = 'DEFAULT'
for sink in self.sinks: for sink in self.sinks:
@ -191,19 +190,17 @@ class PulseAudio(Module, ColorRangeModule):
output_format = self.format output_format = self.format
if self.bar_type == 'vertical': if self.bar_type == 'vertical':
volume_bar = make_vertical_bar(volume_percent, self.vertical_bar_width, glyphs=self.vertical_bar_glyphs) volume_bar = make_vertical_bar(volume_percent, self.vertical_bar_width,
glyphs=self.vertical_bar_glyphs)
elif self.bar_type == 'horizontal': elif self.bar_type == 'horizontal':
volume_bar = make_bar(volume_percent) volume_bar = make_bar(volume_percent)
else: else:
raise Exception("bar_type must be 'vertical' or 'horizontal'") raise Exception("bar_type must be 'vertical' or 'horizontal'")
selected = "" selected = ""
dump = subprocess.check_output("pacmd dump".split(), universal_newlines=True) default_sink = self._call_pactl(["get-default-sink"]).strip()
for line in dump.split("\n"): if default_sink == self.current_sink:
if line.startswith("set-default-sink"): selected = self.format_selected
default_sink = line.split()[1]
if default_sink == self.current_sink:
selected = self.format_selected
self.output = { self.output = {
"color": color, "color": color,
@ -223,28 +220,33 @@ class PulseAudio(Module, ColorRangeModule):
def change_sink(self): def change_sink(self):
sinks = list(s.split()[1] for s in self.sinks) sinks = list(s.split()[1] for s in self.sinks)
if self.sink is None: if self.sink is None:
next_sink = sinks[(sinks.index(self.current_sink) + 1) % next_sink = sinks[(sinks.index(self.current_sink) + 1) % len(sinks)]
len(sinks)]
else: else:
next_sink = self.current_sink next_sink = self.current_sink
if self.move_sink_inputs: if self.move_sink_inputs:
sink_inputs = subprocess.check_output("pacmd list-sink-inputs".split(), sink_inputs = self._call_pactl(["list-sink-inputs"])
universal_newlines=True)
for input_index in re.findall(r'index:\s+(\d+)', sink_inputs): for input_index in re.findall(r'index:\s+(\d+)', sink_inputs):
command = "pacmd move-sink-input {} {}".format(input_index, next_sink) pactl_args = ["move-sink-input", input_index, next_sink]
self._call_pactl(pactl_args)
self._call_pactl(["set-default-sink", next_sink])
# Not all applications can be moved and pulseaudio, and when def _call_pactl(self, pactl_arguments):
# this fail pacmd print error messaging try:
with open(os.devnull, 'w') as devnull: output = subprocess.check_output(
subprocess.call(command.split(), stdout=devnull) ["pactl"] + [str(arg) for arg in pactl_arguments],
subprocess.call("pacmd set-default-sink {}".format(next_sink).split()) universal_newlines=True)
return output
except Exception:
self.logger.exception("Error while executing pactl")
self.output = {"color": self.color_error, "full_text": "Error while executing pactl"}
self.send_output()
def switch_mute(self): def switch_mute(self):
subprocess.call(['pactl', '--', 'set-sink-mute', self.current_sink, "toggle"]) self._call_pactl(["--", "set-sink-mute", self.current_sink, "toggle"])
def increase_volume(self): def increase_volume(self):
subprocess.call(['pactl', '--', 'set-sink-volume', self.current_sink, "+%s%%" % self.step]) self._call_pactl(["--", "set-sink-volume", self.current_sink, f"+{self.step}%"])
def decrease_volume(self): def decrease_volume(self):
subprocess.call(['pactl', '--', 'set-sink-volume', self.current_sink, "-%s%%" % self.step]) self._call_pactl(["--", "set-sink-volume", self.current_sink, f"-{self.step}%"])