awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

alsabar: rename flag 'mute' to 'playback' in order to avoid confusion; fixes #345

This commit is contained in:
Luke Bonham 2017-06-27 13:11:27 +02:00
parent 6f2b39a266
commit 245ab7c33a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widget/alsabar.lua
View File

@ -29,7 +29,7 @@ local function factory(args)
}, },
_current_level = 0, _current_level = 0,
_mute = "off" _playback = "off"
} }
local args = args or {} local args = args or {}
@ -75,26 +75,26 @@ local function factory(args)
function alsabar.update(callback) function alsabar.update(callback)
helpers.async(format_cmd, function(mixer) helpers.async(format_cmd, function(mixer)
local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") local vol, playback = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
if not volu or not mute then return end if not vol or not playback then return end
if volu ~= alsabar._current_level or mute ~= alsabar._mute then if vol ~= alsabar._current_level or playback ~= alsabar._playback then
alsabar._current_level = tonumber(volu) alsabar._current_level = tonumber(vol)
alsabar.bar:set_value(alsabar._current_level / 100) alsabar.bar:set_value(alsabar._current_level / 100)
if alsabar._current_level == 0 or mute == "off" then if alsabar._current_level == 0 or playback == "off" then
alsabar._mute = mute alsabar._playback = playback
alsabar.tooltip:set_text("[Muted]") alsabar.tooltip:set_text("[Muted]")
alsabar.bar.color = alsabar.colors.mute alsabar.bar.color = alsabar.colors.mute
else else
alsabar._mute = "on" alsabar._playback = "on"
alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu)) alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, vol))
alsabar.bar.color = alsabar.colors.unmute alsabar.bar.color = alsabar.colors.unmute
end end
volume_now = { volume_now = {
level = alsabar._current_level, level = alsabar._current_level,
status = alsabar._mute status = alsabar._playback
} }
settings() settings()
@ -108,7 +108,7 @@ local function factory(args)
alsabar.update(function() alsabar.update(function()
local preset = alsabar.notification_preset local preset = alsabar.notification_preset
if alsabar._mute == "on" then if alsabar._playback == "off" then
preset.title = string.format("%s - Muted", alsabar.channel) preset.title = string.format("%s - Muted", alsabar.channel)
else else
preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level) preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)

2
wiki

@ -1 +1 @@
Subproject commit d92165bdd8782e1c076c26e7d86f99759f2d5bfd Subproject commit 15bc8513bed9cad33cc1d38e4d49a1f4f6008be0