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

alsa, alsabar: make amixer call customizable; fixes #111 in general

This commit is contained in:
luke bonham 2015-06-24 13:50:34 +02:00
parent 172bc21bcf
commit 5fc544049a
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
widgets/alsa.lua
View File

@ -26,13 +26,13 @@ local function worker(args)
local timeout = args.timeout or 5 local timeout = args.timeout or 5
local settings = args.settings or function() end local settings = args.settings or function() end
alsa.card = args.card or "0" alsa.cmd = args.cmd or "amixer"
alsa.channel = args.channel or "Master" alsa.channel = args.channel or "Master"
alsa.widget = wibox.widget.textbox('') alsa.widget = wibox.widget.textbox('')
function alsa.update() function alsa.update()
local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsa.card, alsa.channel))) local f = assert(io.popen(string.format("%s get %s", alsa.cmd, alsa.channel)))
local mixer = f:read("*a") local mixer = f:read("*a")
f:close() f:close()

12
widgets/alsabar.lua
View File

@ -70,9 +70,11 @@ function alsabar.notify()
preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%" preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%"
end end
local int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size) int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size)
preset.text = string.format("[%s%s]", string.rep("|", int), preset.text = "["
string.rep(" ", alsabar.notifications.bar_size - int)) .. string.rep("|", int)
.. string.rep(" ", alsabar.notifications.bar_size - int)
.. "]"
if alsabar._notify ~= nil then if alsabar._notify ~= nil then
alsabar._notify = naughty.notify ({ alsabar._notify = naughty.notify ({
@ -96,7 +98,7 @@ local function worker(args)
local ticks_size = args.ticks_size or 7 local ticks_size = args.ticks_size or 7
local vertical = args.vertical or false local vertical = args.vertical or false
alsabar.card = args.card or alsabar.card alsabar.cmd = args.cmd or "amixer"
alsabar.channel = args.channel or alsabar.channel alsabar.channel = args.channel or alsabar.channel
alsabar.step = args.step or alsabar.step alsabar.step = args.step or alsabar.step
alsabar.colors = args.colors or alsabar.colors alsabar.colors = args.colors or alsabar.colors
@ -115,7 +117,7 @@ local function worker(args)
function alsabar.update() function alsabar.update()
-- Get mixer control contents -- Get mixer control contents
local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsabar.card, alsabar.channel))) local f = assert(io.popen(string.format("%s get %s", alsabar.cmd, alsabar.channel)))
local mixer = f:read("*a") local mixer = f:read("*a")
f:close() f:close()