Fix regression in pulsebar.lua

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 7c853c971fe4fb2876f00598ee34ceedd413c4db..c86db3340bbf3350d85bb6c57075e15414dd7136 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -8,6 +8,7 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

+local shell        = require("awful.util").shell

 local wibox        = require("wibox")
 local string       = { match  = string.match,
                        format = string.format }
 local wibox        = require("wibox")
 local string       = { match  = string.match,
                        format = string.format }


@@ -22,9 +23,16 @@ local function worker(args)
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
     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.last    = {}
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel
+
+    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
+
+    alsa.last = {}

 
     function alsa.update()
         helpers.async(alsa.cmd, function(mixer)
 
     function alsa.update()
         helpers.async(alsa.cmd, function(mixer)


@@ -39,6 +47,7 @@ local function worker(args)
     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)
 
     return alsa
     helpers.newtimer(timer_id, timeout, alsa.update)
 
     return alsa