X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0ef82f83e0baaa2936b6204a24ee3b3b638fd409..03fdf984e93d81ed95945db51c83baf6c23e89e8:/widgets/alsa.lua

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 887f398..93c74cc 100644
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -1,62 +1,54 @@
 
 --[[
-                                                      
-     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 wibox           = require("wibox")
-
-local io              = { popen  = io.popen }
-local string          = { match  = string.match }
-
-local setmetatable    = setmetatable
+local helpers      = require("lain.helpers")
+local shell        = require("awful.util").shell
+local wibox        = require("wibox")
+local string       = { match  = string.match,
+                       format = string.format }
+local setmetatable = setmetatable
 
 -- ALSA volume
 -- lain.widgets.alsa
-local alsa = {}
+local alsa = helpers.make_widget_textbox()
 
 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
 
-    alsa.widget = wibox.widget.textbox('')
-
-    function alsa.update()
-        local f = io.popen('amixer get ' .. channel)
-        local mixer = f:read("*all")
-        f:close()
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel
 
-        volume = {}
+    local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel)
 
-        volume.level, volume.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+    if alsa.togglechannel then
+        format_cmd = { shell, "-c", string.format("%s get %s; %s get %s",
+        alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) }
+    end
 
-        if volume.level == nil
-        then
-            volume.level  = 0
-            volume.status = "off"
-        end
+    alsa.last = {}
 
-        if volume.status == ""
-        then
-            if volume.level == 0
-            then
-                volume.status = "off"
-            else
-                volume.status = "on"
+    function alsa.update()
+        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 }
+                widget = alsa.widget
+                settings()
+                alsa.last = volume_now
             end
-        end
-
-        settings()
+        end)
     end
 
-    newtimer("alsa", timeout, alsa.update)
+    helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
     return setmetatable(alsa, { __index = alsa.widget })
 end