X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/e73a70c2ab26caf981d356756d4f83ad8bfbdb5a..2d67c3962019c47529f357a3c347288c905257b2:/widgets/alsa.lua

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 887f398..7500097 100644
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -1,62 +1,57 @@
 
 --[[
-                                                      
-     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
 
 -- ALSA volume
 -- lain.widgets.alsa
-local alsa = {}
+local alsa = { last_level = "0", last_status = "" }
 
 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('')
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel
+    alsa.widget        = wibox.widget.textbox('')
 
     function alsa.update()
-        local f = io.popen('amixer get ' .. channel)
-        local mixer = f:read("*all")
-        f:close()
+        mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
+        l,s   = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
-        volume = {}
-
-        volume.level, volume.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
-
-        if volume.level == nil
-        then
-            volume.level  = 0
-            volume.status = "off"
+        -- HDMIs can have a channel different from Master for toggling mute
+        if alsa.togglechannel then
+            s = string.match(read_pipe(string.format("%s get %s", alsa.cmd, alsa.togglechannel)), "%[(%a+)%]")
         end
 
-        if volume.status == ""
-        then
-            if volume.level == 0
-            then
-                volume.status = "off"
-            else
-                volume.status = "on"
-            end
-        end
+        if alsa.last_level ~= l or alsa.last_status ~= s then
+            volume_now = { level = l, status = s }
+            alsa.last_level  = l
+            alsa.last_status = s
 
-        settings()
+            widget = alsa.widget
+            settings()
+        end
     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