X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/98977a1888c57a00dbefcbf83c4e598daeab33aa..7d431ef9c41f66e885dbace27e0843395940f1bd:/widgets/alsa.lua?ds=inline diff --git a/widgets/alsa.lua b/widgets/alsa.lua index 0bb2059..7500097 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -7,68 +7,50 @@ --]] -local newtimer = require("lain.helpers").newtimer -local read_pipe = require("lain.helpers").read_pipe +local newtimer = require("lain.helpers").newtimer +local read_pipe = require("lain.helpers").read_pipe -local wibox = require("wibox") +local wibox = require("wibox") -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 = { - level = "0", - status = "off", -} +local alsa = { last_level = "0", last_status = "" } local function worker(args) local args = args or {} - local timeout = args.timeout or 1 + 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.widget = wibox.widget.textbox('') function alsa.update() - local mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel)) - - 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 - if alsa.level ~= volume_now.level or alsa.status ~= volume_now.status - then widget = alsa.widget settings() - - alsa.level = volume_now.level - alsa.status = volume_now.status end end timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel) - newtimer(timer_id, timeout, alsa.update) return setmetatable(alsa, { __index = alsa.widget })