X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6603c641c6ce675b010ca1977423747ca55d8795..03fdf984e93d81ed95945db51c83baf6c23e89e8:/widgets/alsa.lua diff --git a/widgets/alsa.lua b/widgets/alsa.lua index 85d5311..93c74cc 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -7,60 +7,48 @@ --]] -local newtimer = require("lain.helpers").newtimer -local read_pipe = require("lain.helpers").read_pipe - -local wibox = require("wibox") - -local string = { match = string.match, - format = string.format } - -local setmetatable = setmetatable +local helpers = require("lain.helpers") +local shell = require("awful.util").shell +local wibox = require("wibox") +local string = { match = string.match, + format = string.format } +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('') - - function alsa.update() - local mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel)) + alsa.cmd = args.cmd or "amixer" + alsa.channel = args.channel or "Master" + alsa.togglechannel = args.togglechannel - volume_now = {} + local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel) - volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)") + if alsa.togglechannel then + format_cmd = { shell, "-c", string.format("%s get %s; %s get %s", + alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) } + end - if volume_now.level == nil - then - volume_now.level = "0" - volume_now.status = "off" - end + alsa.last = {} - if volume_now.status == "" - then - if volume_now.level == "0" - then - volume_now.status = "off" - else - volume_now.status = "on" + function alsa.update() + helpers.async(format_cmd, function(mixer) + local l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)") + if alsa.last.level ~= l or alsa.last.status ~= s then + volume_now = { level = l, status = s } + widget = alsa.widget + settings() + alsa.last = volume_now end - end - - widget = alsa.widget - settings() + end) end - timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel) - - newtimer(timer_id, timeout, alsa.update) + helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update) return setmetatable(alsa, { __index = alsa.widget }) end