Merge pull request #282 from 2009/patch-1

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 979d9fd106470025942e650e99ac4e172d714fed..c86db3340bbf3350d85bb6c57075e15414dd7136 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -7,64 +7,50 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer        = require("lain.helpers").newtimer
-
-local wibox           = require("wibox")
-
-local io              = { popen  = io.popen }
-local string          = { match  = string.match,
-                          format = string.format }
-
-local setmetatable    = setmetatable
+local helpers      = require("lain.helpers")
+local shell        = require("awful.util").shell
+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 timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
 
 local function worker(args)
     local args     = args or {}
     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('')
-
-    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 = {}
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel

 
 

-        volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+    if alsa.togglechannel then
+        alsa.cmd = { shell, "-c", string.format("%s get %s; %s get %s",
+        alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) }
+    end

 
 

-        if volume_now.level == nil
-        then
-            volume_now.level  = "0"
-            volume_now.status = "off"
-        end
+    alsa.last = {}

 
 

-        if volume_now.status == ""
-        then
-            if volume_now.level == "0"
-            then
-                volume_now.status = "off"
-            else
-                volume_now.status = "on"
+    function alsa.update()
+        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)
 

-    newtimer(timer_id, timeout, alsa.update)
+    helpers.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 })