]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/alsa.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

fixing typos
[etc/awesome.git] / widgets / alsa.lua
index d85a0802e81d4a39ec83237c46409a74cf1bfd20..7500097b05eac9e0cc3bcc695d9f4b44551e5522 100644 (file)
@@ -26,14 +26,20 @@ 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.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]*)")
 
 
     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
         if alsa.last_level ~= l or alsa.last_status ~= s then
             volume_now = { level = l, status = s }
             alsa.last_level  = l