Allow multiple instances of the pulseaudio widget

Enable switching between default sink or source in pulseaudio widget
This commit is contained in:
Calvin Timmer 2017-02-02 14:37:43 +01:00 committed by copycat-killer
parent 9ec9f475c8
commit a274576cfd
2 changed files with 32 additions and 31 deletions

View File

@ -16,17 +16,16 @@ local setmetatable = setmetatable
-- PulseAudio volume
-- lain.widgets.pulseaudio
local pulseaudio = {}
local function worker(args)
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.widget = wibox.widget.textbox()
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'"
function pulseaudio.update()
if scallback then pulseaudio.cmd = scallback() end
@ -34,7 +33,8 @@ local function worker(args)
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",
device = string.match(s, "device.string = \"(%S+)\"") or "N/A",
sink = device, -- legacy API
muted = string.match(s, "muted: (%S+)") or "N/A"
}
@ -49,6 +49,7 @@ local function worker(args)
volume_now.right = volume_now.channel[2] or "N/A"
widget = pulseaudio.widget
settings()
end)
end
@ -58,4 +59,4 @@ local function worker(args)
return pulseaudio
end
return setmetatable(pulseaudio, { __call = function(_, ...) return worker(...) end })
return setmetatable({}, { __call = function(_, ...) return worker(...) end })

2
wiki

@ -1 +1 @@
Subproject commit e2ce961ae4ba86f373d26b79b7e7b4891e1a9aa9
Subproject commit af671ad9bb1ce9c7bb74a75f489a3b5d0a934558