X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0279482eeb5867f49b4efc83d591393f9c3d0adb..5af7a8c1726862f770b84e46cfa0eee064eac0fb:/widgets/alsa.lua

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 7c853c9..96f30b3 100644
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -8,6 +8,7 @@
 --]]
 
 local helpers      = require("lain.helpers")
+local shell        = require("awful.util").shell
 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
 
-    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)
@@ -38,10 +46,9 @@ local function worker(args)
         end)
     end
 
-    timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
-    helpers.newtimer(timer_id, timeout, alsa.update)
+    helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
-    return alsa
+    return setmetatable(alsa, { __index = alsa.widget })
 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })