X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/1574793252a5b5ac22734d9d7a26dd4f6869b72e..7de62e4d9fe0d3a7521fc72a66c905d6f343c27b:/widgets/alsa.lua?ds=sidebyside

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index a356892..0bb2059 100644
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -8,10 +8,10 @@
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
+local read_pipe       = require("lain.helpers").read_pipe
 
 local wibox           = require("wibox")
 
-local io              = { popen  = io.popen }
 local string          = { match  = string.match,
                           format = string.format }
 
@@ -19,11 +19,14 @@ local setmetatable    = setmetatable
 
 -- ALSA volume
 -- lain.widgets.alsa
-local alsa = {}
+local alsa = {
+    level  = "0",
+    status = "off",
+}
 
 local function worker(args)
     local args     = args or {}
-    local timeout  = args.timeout or 5
+    local timeout  = args.timeout or 1
     local settings = args.settings or function() end
 
     alsa.cmd     = args.cmd or "amixer"
@@ -32,9 +35,7 @@ local function worker(args)
     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()
+        local mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
 
         volume_now = {}
 
@@ -56,11 +57,19 @@ local function worker(args)
             end
         end
 
-        widget = alsa.widget
-        settings()
+        if alsa.level ~= volume_now.level or alsa.status ~= volume_now.status
+        then
+            widget = alsa.widget
+            settings()
+
+            alsa.level = volume_now.level
+            alsa.status = volume_now.status
+        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