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

[modules/pulseaudio] More exact enforcement of limits

Browse source 
If increasing would exceed the volume, set it to exactly the limit
instead. Also, if channels have different volumes, ensure that the
higher channel does not exceed the volume.

fixes #354
This commit is contained in:
Tobias Witek 2019-01-20 09:09:11 +01:00
parent bff5322cff
commit aab259b826
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bumblebee/modules/pulseaudio.py
View file

@ -8,6 +8,7 @@ Parameters:
* pulseaudio.autostart: If set to "true" (default is "false"), automatically starts the pulseaudio daemon if it is not running * pulseaudio.autostart: If set to "true" (default is "false"), automatically starts the pulseaudio daemon if it is not running
* pulseaudio.percent_change: How much to change volume by when scrolling on the module (default is 2%) * pulseaudio.percent_change: How much to change volume by when scrolling on the module (default is 2%)
* pulseaudio.limit: Upper limit for setting the volume (default is 0%, which means "no limit") * pulseaudio.limit: Upper limit for setting the volume (default is 0%, which means "no limit")
Note: If the left and right channels have different volumes, the limit might not be reached exactly.
Requires the following executable: Requires the following executable:
* pulseaudio * pulseaudio
@ -76,8 +77,17 @@ class Module(bumblebee.engine.Module):
def increase_volume(self, event): def increase_volume(self, event):
if self._limit > 0: # we need to check the limit if self._limit > 0: # we need to check the limit
if int(self._left) >= self._limit or int(self._right) >= self._limit: left = int(self._left)
return right = int(self._right)
if left + self._change >= self._limit or right + self._change >= self._limit:
if left == right:
# easy case, just set to limit
self.set_volume("{}%".format(self._limit))
return
else:
# don't adjust anymore, since i don't know how to update only one channel
return
self.set_volume("+{}%".format(self._change)) self.set_volume("+{}%".format(self._change))
def decrease_volume(self, event): def decrease_volume(self, event):