awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pulseaudio: improve scallback #169; #168

This commit is contained in:
copycat-killer 2016-02-25 13:26:20 +01:00
parent cded8aad10
commit 62ad74c4cd
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
widgets/pulseaudio.lua
View File

@ -15,6 +15,7 @@ local string = { match = string.match,
local setmetatable = setmetatable local setmetatable = setmetatable
local naughty = require("naughty")
-- PulseAudio volume -- PulseAudio volume
-- lain.widgets.pulseaudio -- lain.widgets.pulseaudio
local pulseaudio = {} local pulseaudio = {}
@ -23,24 +24,20 @@ local function worker(args)
local args = args or {} local args = args or {}
local timeout = args.timeout or 5 local timeout = args.timeout or 5
local settings = args.settings or function() end local settings = args.settings or function() end
local scallback = args.scallback or nil local scallback = args.scallback
pulseaudio.sink = args.sink or 0 -- user defined or first one 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 '/base volume/d' -e '/index: %d/p' -e '/volume:/p' -e '/muted:/p' | sed -n -e '/index: %d/,+2p'",
pulseaudio.sink, pulseaudio.sink)
pulseaudio.widget = wibox.widget.textbox('') pulseaudio.widget = wibox.widget.textbox('')
function pulseaudio.update() function pulseaudio.update()
local s = read_pipe(pulseaudio.cmd) local s = read_pipe(pulseaudio.cmd)
volume_now = {} volume_now = {}
volume_now.left = tonumber(string.match(s, "left.-(%d+)%%")) or tonumber(string.match(s, "0:.-(%d+)%%")) volume_now.left = tonumber(string.match(s, ":.-(%d+)%%"))
volume_now.right = tonumber(string.match(s, "right.-(%d+)%%")) or tonumber(string.match(s, "1:.-(%d+)%%")) volume_now.right = tonumber(string.match(s, ":.-(%d+)%%"))
volume_now.muted = string.match(s, "muted: (%S+)") volume_now.muted = string.match(s, "muted: (%S+)")
if scallback ~= nil then if scallback then pulseaudio.sink = scallback() end
pulseaudio.sink = scallback()
end
widget = pulseaudio.widget widget = pulseaudio.widget
settings() settings()