X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/eb8cec907a50f3fd6df4b14ae10b910444017f92..f6cc2aedd67c1b63f14b8975ccb9a815d04117f6:/widgets/alsa.lua?ds=sidebyside

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 8571ec6..979d9fd 100644
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -1,10 +1,10 @@
 
 --[[
-                                                      
-     Licensed under GNU General Public License v2     
-      * (c) 2013, Luke Bonham                         
-      * (c) 2010, Adrian C. <anrxc@sysphere.org>      
-                                                      
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013, Luke Bonham                     
+      * (c) 2010, Adrian C. <anrxc@sysphere.org>  
+                                                  
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
@@ -12,7 +12,8 @@ local newtimer        = require("lain.helpers").newtimer
 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,44 +24,47 @@ local alsa = {}
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
-    local channel  = args.channel or "Master"
     local settings = args.settings or function() end
 
-    widget = wibox.widget.textbox('')
+    alsa.cmd     = args.cmd or "amixer"
+    alsa.channel = args.channel or "Master"
 
-    function update()
-        local f = io.popen('amixer get ' .. channel)
-        local mixer = f:read("*all")
+    alsa.widget = wibox.widget.textbox('')
+
+    function alsa.update()
+        local f = assert(io.popen(string.format("%s get %s", alsa.cmd, alsa.channel)))
+        local mixer = f:read("*a")
         f:close()
 
-        volume = {}
+        volume_now = {}
 
-        volume.level, volume.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+        volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
-        if volume.level == nil
+        if volume_now.level == nil
         then
-            volume.level  = 0
-            volume.status = "off"
+            volume_now.level  = "0"
+            volume_now.status = "off"
         end
 
-        if volume.status == ""
+        if volume_now.status == ""
         then
-            if volume.level == 0
+            if volume_now.level == "0"
             then
-                volume.status = "off"
+                volume_now.status = "off"
             else
-                volume.status = "on"
+                volume_now.status = "on"
             end
         end
 
+        widget = alsa.widget
         settings()
     end
 
-    newtimer("alsa", timeout, update)
+    timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
 
-    output = { widget = widget, notify = update }
+    newtimer(timer_id, timeout, alsa.update)
 
-    return setmetatable(output, { __index = output.widget })
+    return setmetatable(alsa, { __index = alsa.widget })
 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })