Merge pull request #173 from guotsuan/master

[etc/awesome.git] / widgets / alsa.lua

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 3e025bbd252712f8f152e65c5a6fc783ffe8348c..85d53114e132a683fe2af8af9f86908af61b8f39 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -1,18 +1,19 @@
 
 --[[
 
 --[[

-                                                      
-     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
 --]]
 
 local newtimer        = require("lain.helpers").newtimer

+local read_pipe       = require("lain.helpers").read_pipe

 
 local wibox           = require("wibox")
 
 
 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
 
 
 local setmetatable    = setmetatable
 


@@ -23,15 +24,15 @@ local alsa = {}
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
 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
 
     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()
     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 = {}
 
 
         volume_now = {}
 


@@ -57,7 +58,9 @@ local function worker(args)
         settings()
     end
 
         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
 
     return setmetatable(alsa, { __index = alsa.widget })
 end