fs/alsabar: small fixes

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 85d53114e132a683fe2af8af9f86908af61b8f39..7c853c971fe4fb2876f00598ee34ceedd413c4db 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -7,19 +7,15 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer        = require("lain.helpers").newtimer
-local read_pipe       = require("lain.helpers").read_pipe
-
-local wibox           = require("wibox")
-
-local string          = { match  = string.match,
-                          format = string.format }
-
-local setmetatable    = setmetatable
+local helpers      = require("lain.helpers")
+local wibox        = require("wibox")
+local string       = { match  = string.match,
+                       format = string.format }
+local setmetatable = setmetatable

 
 -- ALSA volume
 -- lain.widgets.alsa
 
 -- ALSA volume
 -- lain.widgets.alsa

-local alsa = {}
+local alsa = helpers.make_widget_textbox()

 
 local function worker(args)
     local args     = args or {}
 
 local function worker(args)
     local args     = args or {}


@@ -28,41 +24,24 @@ local function worker(args)
 
     alsa.cmd     = args.cmd or "amixer"
     alsa.channel = args.channel or "Master"
 
     alsa.cmd     = args.cmd or "amixer"
     alsa.channel = args.channel or "Master"

-
-    alsa.widget = wibox.widget.textbox('')
+    alsa.last    = {}

 
     function alsa.update()
 
     function alsa.update()

-        local mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
-
-        volume_now = {}
-
-        volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
-
-        if volume_now.level == nil
-        then
-            volume_now.level  = "0"
-            volume_now.status = "off"
-        end
-
-        if volume_now.status == ""
-        then
-            if volume_now.level == "0"
-            then
-                volume_now.status = "off"
-            else
-                volume_now.status = "on"
+        helpers.async(alsa.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

-        end
-
-        widget = alsa.widget
-        settings()
+        end)

     end
 
     timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
     end
 
     timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)

+    helpers.newtimer(timer_id, timeout, alsa.update)

 
 

-    newtimer(timer_id, timeout, alsa.update)
-
-    return setmetatable(alsa, { __index = alsa.widget })
+    return alsa

 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })