madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged.
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
-local newtimer = require("lain.helpers").newtimer
+local newtimer = require("lain.helpers").newtimer
+local read_pipe = require("lain.helpers").read_pipe
-local wibox = require("wibox")
+local wibox = require("wibox")
-local io = { popen = io.popen }
-local string = { match = string.match }
+local string = { match = string.match,
+ format = string.format }
-local setmetatable = setmetatable
+local setmetatable = setmetatable
-- ALSA volume
-- lain.widgets.alsa
-- ALSA volume
-- lain.widgets.alsa
+local alsa = { last_level = "0", last_status = "" }
local function worker(args)
local args = args or {}
local timeout = args.timeout or 5
local function worker(args)
local args = args or {}
local timeout = args.timeout or 5
- local channel = args.channel or "Master"
local settings = args.settings or function() end
local settings = args.settings or function() end
- alsa.widget = wibox.widget.textbox('')
+ alsa.cmd = args.cmd or "amixer"
+ alsa.channel = args.channel or "Master"
+ alsa.togglechannel = args.togglechannel
+ alsa.widget = wibox.widget.textbox('')
- local f = assert(io.popen('amixer get ' .. channel))
- local mixer = f:read("*all")
- f:close()
+ mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
+ l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
- volume_now = {}
-
- volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
-
- if volume_now.level == nil
- then
- volume_now.level = "0"
- volume_now.status = "off"
+ -- HDMIs can have a channel different from Master for toggling mute
+ if alsa.togglechannel then
+ s = string.match(read_pipe(string.format("%s get %s", alsa.cmd, alsa.togglechannel)), "%[(%a+)%]")
- if volume_now.status == ""
- then
- if volume_now.level == "0"
- then
- volume_now.status = "off"
- else
- volume_now.status = "on"
- end
- end
+ if alsa.last_level ~= l or alsa.last_status ~= s then
+ volume_now = { level = l, status = s }
+ alsa.last_level = l
+ alsa.last_status = s
- widget = alsa.widget
- settings()
+ widget = alsa.widget
+ settings()
+ end
- newtimer("alsa", timeout, alsa.update)
+ timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
+ newtimer(timer_id, timeout, alsa.update)
return setmetatable(alsa, { __index = alsa.widget })
end
return setmetatable(alsa, { __index = alsa.widget })
end