X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/4e4bf44d2ff80c1ab68f1d20e3bc115619295653..6f7dae29dc64fb5adc5677d24eaba90ea54510f9:/widgets/alsa.lua diff --git a/widgets/alsa.lua b/widgets/alsa.lua index 114e2b2..85d5311 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -8,11 +8,12 @@ --]] local newtimer = require("lain.helpers").newtimer +local read_pipe = require("lain.helpers").read_pipe 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 @@ -23,15 +24,15 @@ local alsa = {} local function worker(args) local args = args or {} local timeout = args.timeout or 5 - local channel = args.channel or "Master -c 1" 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 f = assert(io.popen('amixer get ' .. channel)) - local mixer = f:read("*all") - f:close() + local mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel)) volume_now = {} @@ -57,7 +58,9 @@ local function worker(args) 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