Merge pull request #233 from aajjbb/luarocks-file

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index d85a0802e81d4a39ec83237c46409a74cf1bfd20..7500097b05eac9e0cc3bcc695d9f4b44551e5522 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -26,14 +26,20 @@ 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.widget  = wibox.widget.textbox('')
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel
+    alsa.widget        = wibox.widget.textbox('')
 
     function alsa.update()
         mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
         l,s   = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
 
+        -- HDMIs can have a channel different from Master for toggling mute
+        if alsa.togglechannel then
+            s = string.match(read_pipe(string.format("%s get %s", alsa.cmd, alsa.togglechannel)), "%[(%a+)%]")
+        end
+
         if alsa.last_level ~= l or alsa.last_status ~= s then
             volume_now = { level = l, status = s }
             alsa.last_level  = l