X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/156515eb28c002300aaf06651f7c412ca2bc07f1..03fdf984e93d81ed95945db51c83baf6c23e89e8:/widgets/alsa.lua?ds=sidebyside

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index c86db33..93c74cc 100644
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -27,15 +27,17 @@ local function worker(args)
     alsa.channel       = args.channel or "Master"
     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 }
@@ -46,11 +48,9 @@ local function worker(args)
         end)
     end
 
-    timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
-
-    helpers.newtimer(timer_id, timeout, alsa.update)
+    helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
-    return alsa
+    return setmetatable(alsa, { __index = alsa.widget })
 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })