From: Calvin Timmer Date: Thu, 2 Feb 2017 13:37:43 +0000 (+0100) Subject: Allow multiple instances of the pulseaudio widget X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/a274576cfd89c1475aa6b9149ad25fdd5cda1060?ds=sidebyside Allow multiple instances of the pulseaudio widget Enable switching between default sink or source in pulseaudio widget --- diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua index 68d3066..590bd0f 100644 --- a/widgets/pulseaudio.lua +++ b/widgets/pulseaudio.lua @@ -16,46 +16,47 @@ local setmetatable = setmetatable -- PulseAudio volume -- lain.widgets.pulseaudio -local pulseaudio = {} local function worker(args) - local args = args or {} - local timeout = args.timeout or 5 - local settings = args.settings or function() end - local scallback = args.scallback + local pulseaudio = { wibox.widget.textbox() } + local args = args or {} + local devicetype = args.devicetype or "sink" + local timeout = args.timeout or 5 + local settings = args.settings or function() end + local scallback = args.scallback - pulseaudio.cmd = args.cmd or "pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'" + pulseaudio.cmd = args.cmd or "pacmd list-" .. devicetype .. "s | 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() + if scallback then pulseaudio.cmd = scallback() end - function pulseaudio.update() - if scallback then pulseaudio.cmd = scallback() end + helpers.async({ shell, "-c", pulseaudio.cmd }, function(s) + volume_now = { + index = string.match(s, "index: (%S+)") or "N/A", + device = string.match(s, "device.string = \"(%S+)\"") or "N/A", + sink = device, -- legacy API + muted = string.match(s, "muted: (%S+)") or "N/A" + } - helpers.async({ shell, "-c", pulseaudio.cmd }, function(s) - volume_now = { - index = string.match(s, "index: (%S+)") or "N/A", - sink = string.match(s, "device.string = \"(%S+)\"") or "N/A", - 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 - 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" - volume_now.left = volume_now.channel[1] or "N/A" - volume_now.right = volume_now.channel[2] or "N/A" + widget = pulseaudio.widget - widget = pulseaudio.widget - settings() - end) - end + settings() + end) + end - helpers.newtimer("pulseaudio", timeout, pulseaudio.update) + helpers.newtimer("pulseaudio", timeout, pulseaudio.update) - return pulseaudio + return pulseaudio end -return setmetatable(pulseaudio, { __call = function(_, ...) return worker(...) end }) +return setmetatable({}, { __call = function(_, ...) return worker(...) end }) diff --git a/wiki b/wiki index e2ce961..af671ad 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit e2ce961ae4ba86f373d26b79b7e7b4891e1a9aa9 +Subproject commit af671ad9bb1ce9c7bb74a75f489a3b5d0a934558