-
--[[
-
- Licensed under GNU General Public License v2
- * (c) 2013, Luke Bonham
- * (c) 2013, Rman
-
+
+ Licensed under GNU General Public License v2
+ * (c) 2013, Luca CPZ
+ * (c) 2013, Rman
+
--]]
local helpers = require("lain.helpers")
},
_current_level = 0,
- _mute = "off"
+ _playback = "off"
}
local args = args or {}
function alsabar.update(callback)
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
- alsabar._current_level = tonumber(volu)
+ if vol ~= alsabar._current_level or playback ~= alsabar._playback then
+ alsabar._current_level = tonumber(vol)
alsabar.bar:set_value(alsabar._current_level / 100)
- if alsabar._current_level == 0 or mute == "off" then
- alsabar._mute = mute
+ if alsabar._current_level == 0 or playback == "off" then
+ alsabar._playback = playback
alsabar.tooltip:set_text("[Muted]")
alsabar.bar.color = alsabar.colors.mute
else
- alsabar._mute = "on"
- alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu))
+ alsabar._playback = "on"
+ alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, vol))
alsabar.bar.color = alsabar.colors.unmute
end
volume_now = {
level = alsabar._current_level,
- status = alsabar._mute
+ status = alsabar._playback
}
settings()
alsabar.update(function()
local preset = alsabar.notification_preset
- if alsabar._mute == "on" then
- preset.title = string.format("%s - Muted", alsabar.channel)
- else
- preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
+ preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
+
+ if alsabar._playback == "off" then
+ preset.title = preset.title .. " Muted"
+ end
+
+ -- tot is the maximum number of ticks to display in the notification
+ -- fallback: default horizontal wibox height
+ local wib, tot = awful.screen.focused().mywibox, 20
+
+ -- if we can grab mywibox, tot is defined as its height if
+ -- horizontal, or width otherwise
+ if wib then
+ if wib.position == "left" or wib.position == "right" then
+ tot = wib.width
+ else
+ tot = wib.height
+ end
end
- int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
+ int = math.modf((alsabar._current_level / 100) * tot)
preset.text = string.format("[%s%s]", string.rep("|", int),
- string.rep(" ", awful.screen.focused().mywibox.height - int))
+ string.rep(" ", tot - int))
if alsabar.followtag then preset.screen = awful.screen.focused() end