X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/85ed92417dfca8fbdcfc89b7efb5308edd4d1193..7dce46c34d7bf3e8ccdc03aa10d25d4df581326d:/widgets/pulseaudio.lua?ds=sidebyside

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index c2686d8..15bea8b 100644
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -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
@@ -25,7 +26,7 @@ local function worker(args)
    local settings    = args.settings or function() end
    local scallback   = args.scallback
 
-   pulseaudio.cmd    = args.cmd or string.format("pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p'")
+   pulseaudio.cmd    = args.cmd or string.format("pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'")
    pulseaudio.widget = wibox.widget.textbox('')
 
    function pulseaudio.update()
@@ -33,9 +34,19 @@ 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.sink  = string.match(s, "device.string = \"(%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()