Allow multiple instances of the pulseaudio widget
Enable switching between default sink or source in pulseaudio widget
This commit is contained in:
parent
9ec9f475c8
commit
a274576cfd
2 changed files with 32 additions and 31 deletions
|
@ -16,46 +16,47 @@ local setmetatable = setmetatable
|
||||||
|
|
||||||
-- PulseAudio volume
|
-- PulseAudio volume
|
||||||
-- lain.widgets.pulseaudio
|
-- lain.widgets.pulseaudio
|
||||||
local pulseaudio = {}
|
|
||||||
|
|
||||||
local function worker(args)
|
local function worker(args)
|
||||||
local args = args or {}
|
local pulseaudio = { wibox.widget.textbox() }
|
||||||
local timeout = args.timeout or 5
|
local args = args or {}
|
||||||
local settings = args.settings or function() end
|
local devicetype = args.devicetype or "sink"
|
||||||
local scallback = args.scallback
|
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()
|
helpers.async({ shell, "-c", pulseaudio.cmd }, function(s)
|
||||||
if scallback then pulseaudio.cmd = scallback() end
|
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)
|
local ch = 1
|
||||||
volume_now = {
|
volume_now.channel = {}
|
||||||
index = string.match(s, "index: (%S+)") or "N/A",
|
for v in string.gmatch(s, ":.-(%d+)%%") do
|
||||||
sink = string.match(s, "device.string = \"(%S+)\"") or "N/A",
|
volume_now.channel[ch] = v
|
||||||
muted = string.match(s, "muted: (%S+)") or "N/A"
|
ch = ch + 1
|
||||||
}
|
end
|
||||||
|
|
||||||
local ch = 1
|
volume_now.left = volume_now.channel[1] or "N/A"
|
||||||
volume_now.channel = {}
|
volume_now.right = volume_now.channel[2] or "N/A"
|
||||||
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"
|
widget = pulseaudio.widget
|
||||||
volume_now.right = volume_now.channel[2] or "N/A"
|
|
||||||
|
|
||||||
widget = pulseaudio.widget
|
settings()
|
||||||
settings()
|
end)
|
||||||
end)
|
end
|
||||||
end
|
|
||||||
|
|
||||||
helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
|
helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
|
||||||
|
|
||||||
return pulseaudio
|
return pulseaudio
|
||||||
end
|
end
|
||||||
|
|
||||||
return setmetatable(pulseaudio, { __call = function(_, ...) return worker(...) end })
|
return setmetatable({}, { __call = function(_, ...) return worker(...) end })
|
||||||
|
|
2
wiki
2
wiki
|
@ -1 +1 @@
|
||||||
Subproject commit e2ce961ae4ba86f373d26b79b7e7b4891e1a9aa9
|
Subproject commit af671ad9bb1ce9c7bb74a75f489a3b5d0a934558
|
Loading…
Add table
Reference in a new issue