From 62ad74c4cd57b509fd69d85bbd7ca9e6b28496c8 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Thu, 25 Feb 2016 13:26:20 +0100 Subject: [PATCH] pulseaudio: improve scallback #169; #168 --- widgets/pulseaudio.lua | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua index 4f05779..3ce98d4 100644 --- a/widgets/pulseaudio.lua +++ b/widgets/pulseaudio.lua @@ -15,6 +15,7 @@ local string = { match = string.match, local setmetatable = setmetatable +local naughty = require("naughty") -- PulseAudio volume -- lain.widgets.pulseaudio local pulseaudio = {} @@ -23,24 +24,20 @@ 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 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 '/base volume/d' -e '/index: %d/p' -e '/volume:/p' -e '/muted:/p' | sed -n -e '/index: %d/,+2p'", - pulseaudio.sink, pulseaudio.sink) + 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.widget = wibox.widget.textbox('') function pulseaudio.update() local s = read_pipe(pulseaudio.cmd) volume_now = {} - volume_now.left = tonumber(string.match(s, "left.-(%d+)%%")) or tonumber(string.match(s, "0:.-(%d+)%%")) - volume_now.right = tonumber(string.match(s, "right.-(%d+)%%")) or tonumber(string.match(s, "1:.-(%d+)%%")) + volume_now.left = tonumber(string.match(s, ":.-(%d+)%%")) + volume_now.right = tonumber(string.match(s, ":.-(%d+)%%")) volume_now.muted = string.match(s, "muted: (%S+)") - if scallback ~= nil then - pulseaudio.sink = scallback() - end + if scallback then pulseaudio.sink = scallback() end widget = pulseaudio.widget settings() -- 2.39.2