]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

pulseaudio: add sink index, and fetch every channel; #234
authorcopycat-killer <dada@archlinux.info>
Thu, 27 Oct 2016 19:21:21 +0000 (21:21 +0200)
committercopycat-killer <dada@archlinux.info>
Thu, 27 Oct 2016 19:21:21 +0000 (21:21 +0200)
widgets/pulseaudio.lua
wiki

index c2686d8fee97291d4c3e1c9f145689fbe38b2130..4bda3c5a8555b04b3b96552eeef19a10c256814f 100644 (file)
@@ -10,7 +10,8 @@ local read_pipe    = require("lain.helpers").read_pipe
 local newtimer     = require("lain.helpers").newtimer
 local wibox        = require("wibox")
 
-local string       = { match  = string.match,
+local string       = { gmatch = string.gmatch,
+                       match  = string.match,
                        format = string.format }
 
 local setmetatable = setmetatable
@@ -33,9 +34,18 @@ local function worker(args)
       local s = read_pipe(pulseaudio.cmd)
 
       volume_now = {}
-      volume_now.left  = tonumber(string.match(s, ":.-(%d+)%%"))
-      volume_now.right = tonumber(string.match(s, ":.-(%d+)%%"))
-      volume_now.muted = string.match(s, "muted: (%S+)")
+      volume.now.index = string.match(s, "index: (%S+)") or "N/A"
+      volume_now.muted = string.match(s, "muted: (%S+)") or "N/A"
+
+      local ch = 1
+      volume_now.channel = {}
+      for v in string.gmatch(s, ":.-(%d+)%%") do
+          volume_now.channel[ch] = v
+          ch = ch + 1
+      end
+
+      volume_now.left  = volume_now.channel[1] or "N/A"
+      volume_now.right = volume_now.channel[2] or "N/A"
 
       widget = pulseaudio.widget
       settings()
diff --git a/wiki b/wiki
index 4521f127d306b74538d7cde445796978aa1853cf..3f72c72c7e6e75e653869a5c354562bd0b1adf09 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 4521f127d306b74538d7cde445796978aa1853cf
+Subproject commit 3f72c72c7e6e75e653869a5c354562bd0b1adf09