X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/b92942b0e07f4491cf5d96fecee94b1e82675e52..75b19142c160825b0f5ce25feea7eea9970844c6:/widgets/alsa.lua?ds=sidebyside diff --git a/widgets/alsa.lua b/widgets/alsa.lua index 979d9fd..670765a 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -7,64 +7,54 @@ --]] -local newtimer = require("lain.helpers").newtimer +local helpers = require("lain.helpers") +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, - format = string.format } +local string = { match = string.match, + format = string.format } -local setmetatable = setmetatable +local setmetatable = setmetatable -- ALSA volume -- lain.widgets.alsa -local alsa = {} +local alsa = helpers.make_widget_textbox() local function worker(args) local args = args or {} local timeout = args.timeout or 5 local settings = args.settings or function() end - alsa.cmd = args.cmd or "amixer" - alsa.channel = args.channel or "Master" - - alsa.widget = wibox.widget.textbox('') + alsa.cmd = args.cmd or "amixer" + alsa.channel = args.channel or "Master" + alsa.togglechannel = args.togglechannel + alsa.last_level = "0" + alsa.last_status = "" function alsa.update() - local f = assert(io.popen(string.format("%s get %s", alsa.cmd, alsa.channel))) - local mixer = f:read("*a") - f:close() - - volume_now = {} - - volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)") + mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel)) + l, s = 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+)%]") end - 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 end timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel) + helpers.newtimer(timer_id, timeout, alsa.update) - newtimer(timer_id, timeout, alsa.update) - - return setmetatable(alsa, { __index = alsa.widget }) + return alsa end return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })