X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fc5974a9c2838efa8dedbd350d9623e193ab71a3..8c2e1df0c3f648ed70e52fab38a176e2f924407b:/widgets/alsa.lua diff --git a/widgets/alsa.lua b/widgets/alsa.lua index cb7ba49..93c74cc 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -23,19 +23,21 @@ local function worker(args) 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.cmd = args.cmd or "amixer sget " .. alsa.channel alsa.togglechannel = args.togglechannel + local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel) + if alsa.togglechannel then - alsa.cmd = { shell, "-c", string.format("%s get %s; %s get %s", + format_cmd = { shell, "-c", string.format("%s get %s; %s get %s", alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) } end alsa.last = {} function alsa.update() - helpers.async(alsa.cmd, function(mixer) + 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 }