From: copycat-killer Date: Thu, 27 Oct 2016 19:21:21 +0000 (+0200) Subject: pulseaudio: add sink index, and fetch every channel; #234 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/79687bad24e8b782fca0e4270e282a10f3bd56c3?ds=inline;hp=-c pulseaudio: add sink index, and fetch every channel; #234 --- 79687bad24e8b782fca0e4270e282a10f3bd56c3 diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua index c2686d8..4bda3c5 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 @@ -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 4521f12..3f72c72 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 4521f127d306b74538d7cde445796978aa1853cf +Subproject commit 3f72c72c7e6e75e653869a5c354562bd0b1adf09