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

[modules] move amixer2 to amixer

Browse source
This commit is contained in:
tobi-wan-kenobi 2020-05-28 08:23:47 +02:00
parent 006a1d05a9
commit 8cdc84871f
2 changed files with 45 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
bumblebee_status/modules/contrib/amixer.py
View file

@ -1,17 +1,21 @@
"""get volume level
"""get volume level or control it
Parameters:
* amixer.device: Device to use, defaults to "Master,0"
* amixer.device: Device to use (default is Master,0)
* amixer.percent_change: How much to change volume by when scrolling on the module (default is 4%)
contributed by `zetxx <https://github.com/zetxx>`_ - many thanks!
input handling contributed by `ardadem <https://github.com/ardadem>_ - many thanks!
"""
import re
import core.module
import core.widget
import core.input
import util.cli
import util.format
class Module(core.module.Module):
def __init__(self, config, theme):
@ -19,8 +23,43 @@ class Module(core.module.Module):
self.__level = "n/a"
self.__muted = True
device = self.parameter("device", "Master,0")
self._cmdString = "amixer get {}".format(device)
self.__device = self.parameter("device", "Master,0")
self.__change = util.format.asint(
self.parameter("percent_change", "4%").strip("%"), 0, 100
)
events = [
{
"type": "mute",
"action": self.toggle,
"button": core.input.LEFT_MOUSE,
},
{
"type": "volume",
"action": self.increase_volume,
"button": core.input.WHEEL_UP,
},
{
"type": "volume",
"action": self.decrease_volume,
"button": core.input.WHEEL_DOWN,
},
]
for event in events:
core.input.register(self, button=event["button"], cmd=event["action"])
def toggle(self, event):
self.set_parameter("toggle")
def increase_volume(self, event):
self.set_parameter("{}%+".format(self.__change))
def decrease_volume(self, event):
self.set_parameter("{}%-".format(self.__change))
def set_parameter(self, parameter):
util.cli.execute("amixer -q set {} {}".format(self.__device, parameter))
def volume(self, widget):
if self.__level == "n/a":
@ -37,7 +76,7 @@ class Module(core.module.Module):
def update(self):
try:
self.__level = util.cli.execute(
"amixer get {}".format(self.parameter("device", "Master,0"))
"amixer get {}".format(self.__device)
)
except Exception as e:
self.__level = "n/a"
@ -47,5 +86,4 @@ class Module(core.module.Module):
return ["warning", "muted"]
return ["unmuted"]
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

87
bumblebee_status/modules/contrib/amixer2.py
View file

@ -1,87 +0,0 @@
"""get volume level or control it
Parameters:
* amixer.device: Device to use (default is Master,0)
* amixer.percent_change: How much to change volume by when scrolling on the module (default is 4%)
contributed by `zetxx <https://github.com/zetxx>`_ - many thanks!
"""
import re
import core.module
import core.widget
import core.input
import util.cli
import util.format
class Module(core.module.Module):
def __init__(self, config, theme):
super().__init__(config, theme, core.widget.Widget(self.volume))
self._level = "n/a"
self._muted = True
self._device = self.parameter("device", "Master,0")
self._change = util.format.asint(
self.parameter("percent_change", "4%").strip("%"), 0, 100
)
events = [
{
"type": "mute",
"action": self.toggle,
"button": core.input.LEFT_MOUSE,
},
{
"type": "volume",
"action": self.increase_volume,
"button": core.input.WHEEL_UP,
},
{
"type": "volume",
"action": self.decrease_volume,
"button": core.input.WHEEL_DOWN,
},
]
for event in events:
core.input.register(self, button=event["button"], cmd=event["action"])
def toggle(self, event):
self.set_parameter("toggle")
def increase_volume(self, event):
self.set_parameter("{}%+".format(self._change))
def decrease_volume(self, event):
self.set_parameter("{}%-".format(self._change))
def set_parameter(self, parameter):
util.cli.execute("amixer -q set {} {}".format(self._device, parameter))
def volume(self, widget):
if self._level == "n/a":
return self._level
m = re.search(r"([\d]+)\%", self._level)
self._muted = True
if m:
if m.group(1) != "0" and "[on]" in self._level:
self._muted = False
return "{}%".format(m.group(1))
else:
return "0%"
def update(self):
try:
self._level = util.cli.execute(
"amixer get {}".format(self._device)
)
except Exception as e:
self._level = "n/a"
def state(self, widget):
if self._muted:
return ["warning", "muted"]
return ["unmuted"]
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4