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

Merge pull request #422 from jcornwall/master

Browse Source 
Pulseaudio: Wait on child processes to avoid zombies
This commit is contained in:
facetoe 2016-08-05 22:51:16 +08:00 committed by GitHub
commit 686f3e82a9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
i3pystatus/pulseaudio/__init__.py
View File

@ -90,9 +90,8 @@ class PulseAudio(Module, ColorRangeModule):
@property
def sink(self):
self.sinks = subprocess.Popen(['pactl', 'list', 'short', 'sinks'],
stdout=subprocess.PIPE,
universal_newlines=True).stdout.read().splitlines()
self.sinks = subprocess.check_output(['pactl', 'list', 'short', 'sinks'],
universal_newlines=True).splitlines()
bestsink = None
state = 'DEFAULT'
for sink in self.sinks:
@ -184,20 +183,18 @@ class PulseAudio(Module, ColorRangeModule):
sinks = list(s.split()[1] for s in self.sinks)
next_sink = (sinks.index(curr_sink) + 1) % len(sinks)
sink_inputs = subprocess.Popen("pacmd list-sink-inputs".split(),
stdout=subprocess.PIPE,
universal_newlines=True).stdout.read()
sink_inputs = subprocess.check_output("pacmd list-sink-inputs".split(),
universal_newlines=True)
for input_index in re.findall('index:\s+(\d+)', sink_inputs):
command = "pacmd move-sink-input {} {}".format(input_index, sinks[next_sink])
subprocess.Popen(command.split(),
stdout=subprocess.PIPE)
subprocess.Popen("pacmd set-default-sink {}".format(sinks[next_sink]).split())
subprocess.call(command.split())
subprocess.call("pacmd set-default-sink {}".format(sinks[next_sink]).split())
def switch_mute(self):
subprocess.Popen(['pactl', 'set-sink-mute', self.sink, "toggle"])
subprocess.call(['pactl', 'set-sink-mute', self.sink, "toggle"])
def increase_volume(self):
subprocess.Popen(['pactl', 'set-sink-volume', self.sink, "+%s%%" % self.step])
subprocess.call(['pactl', 'set-sink-volume', self.sink, "+%s%%" % self.step])
def decrease_volume(self):
subprocess.Popen(['pactl', 'set-sink-volume', self.sink, "-%s%%" % self.step])
subprocess.call(['pactl', 'set-sink-volume', self.sink, "-%s%%" % self.step])