Merge pull request #214 from 0x0d/master

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 0bb205996054e12ff539e74624af637c3540ffdd..d85a0802e81d4a39ec83237c46409a74cf1bfd20 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -7,68 +7,44 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer        = require("lain.helpers").newtimer
-local read_pipe       = require("lain.helpers").read_pipe
+local newtimer     = require("lain.helpers").newtimer
+local read_pipe    = require("lain.helpers").read_pipe

 
 

-local wibox           = require("wibox")
+local wibox        = require("wibox")

 
 

-local string          = { match  = string.match,
-                          format = string.format }
+local string       = { match  = string.match,
+                       format = string.format }

 
 

-local setmetatable    = setmetatable
+local setmetatable = setmetatable

 
 -- ALSA volume
 -- lain.widgets.alsa
 
 -- 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 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"
     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()
 
     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
+        mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
+        l,s   = string.match(mixer, "([%d]+)%%.*%[([%l]*)")

 
 

-        if volume_now.status == ""
-        then
-            if volume_now.level == "0"
-            then
-                volume_now.status = "off"
-            else
-                volume_now.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

 
 

-        if alsa.level ~= volume_now.level or alsa.status ~= volume_now.status
-        then

             widget = alsa.widget
             settings()
             widget = alsa.widget
             settings()

-
-            alsa.level = volume_now.level
-            alsa.status = volume_now.status

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

-

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