Merge branch 'patch-3' of https://github.com/andering/lain into andering-patch-3

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 979d9fd106470025942e650e99ac4e172d714fed..dba20e7bab53b87270d9fac1ce1c09fd58bc15b2 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -8,10 +8,10 @@
 --]]
 
 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,
                           format = string.format }
 
 local string          = { match  = string.match,
                           format = string.format }
 


@@ -19,7 +19,7 @@ local setmetatable    = setmetatable
 
 -- ALSA volume
 -- lain.widgets.alsa
 
 -- ALSA volume
 -- lain.widgets.alsa

-local alsa = {}
+local alsa = { last_level = "0", last_status = "" }

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


@@ -28,36 +28,20 @@ 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.widget  = wibox.widget.textbox('')

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

-        local f = assert(io.popen(string.format("%s get %s", alsa.cmd, alsa.channel)))
-        local mixer = f:read("*a")
-        f:close()
-
-        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 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.level == nil
-        then
-            volume_now.level  = "0"
-            volume_now.status = "off"
+            widget = alsa.widget
+            settings()

         end
         end

-
-        if volume_now.status == ""
-        then
-            if volume_now.level == "0"
-            then
-                volume_now.status = "off"
-            else
-                volume_now.status = "on"
-            end
-        end
-
-        widget = alsa.widget
-        settings()

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