Fixed initial state where alsa.update may never be called

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 0bb205996054e12ff539e74624af637c3540ffdd..dba20e7bab53b87270d9fac1ce1c09fd58bc15b2 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -19,51 +19,28 @@ local setmetatable    = setmetatable
 
 -- ALSA volume
 -- lain.widgets.alsa
-local alsa = {
-    level  = "0",
-    status = "off",
-}
+local alsa = { last_level = "0", last_status = "" }
 
 local function worker(args)
     local args     = args or {}
-    local timeout  = args.timeout or 1
+    local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
     alsa.cmd     = args.cmd or "amixer"
     alsa.channel = args.channel or "Master"
-
-    alsa.widget = wibox.widget.textbox('')
+    alsa.widget  = wibox.widget.textbox('')
 
     function alsa.update()
-        local mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
-
-        volume_now = {}
+        mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
+        l, s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
-        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 alsa.last_level ~= l or alsa.last_status ~= s then
+            volume_now = { level = l, status = s }
+            alsa.last_level = l
+            alsa.last_status = s
 
-        if volume_now.status == ""
-        then
-            if volume_now.level == "0"
-            then
-                volume_now.status = "off"
-            else
-                volume_now.status = "on"
-            end
-        end
-
-        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