X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fc5974a9c2838efa8dedbd350d9623e193ab71a3..a274576cfd89c1475aa6b9149ad25fdd5cda1060:/widgets/alsa.lua?ds=inline

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index cb7ba49..f73194b 100644
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -16,26 +16,28 @@ local setmetatable = setmetatable
 
 -- ALSA volume
 -- lain.widgets.alsa
-local alsa = helpers.make_widget_textbox()
 
 local function worker(args)
+    local alsa     = { widget = wibox.widget.textbox() }
     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.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 }
@@ -48,7 +50,7 @@ local function worker(args)
 
     helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
-    return setmetatable(alsa, { __index = alsa.widget })
+    return alsa
 end
 
-return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })