X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/62ad74c4cd57b509fd69d85bbd7ca9e6b28496c8..1c43f4df29de9e15f629a7f0beaa355875305916:/widgets/pulseaudio.lua?ds=sidebyside

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index 3ce98d4..c2686d8 100644
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -6,16 +6,15 @@
                                                   
 --]]
 
-local read_pipe       = require("lain.helpers").read_pipe
-local newtimer        = require("lain.helpers").newtimer
-local wibox           = require("wibox")
+local read_pipe    = require("lain.helpers").read_pipe
+local newtimer     = require("lain.helpers").newtimer
+local wibox        = require("wibox")
 
-local string          = { match  = string.match,
-                          format = string.format }
+local string       = { match  = string.match,
+                       format = string.format }
 
-local setmetatable    = setmetatable
+local setmetatable = setmetatable
 
-local naughty = require("naughty")
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
 local pulseaudio = {}
@@ -30,6 +29,7 @@ local function worker(args)
    pulseaudio.widget = wibox.widget.textbox('')
 
    function pulseaudio.update()
+      if scallback then pulseaudio.cmd = scallback() end
       local s = read_pipe(pulseaudio.cmd)
 
       volume_now = {}
@@ -37,13 +37,11 @@ local function worker(args)
       volume_now.right = tonumber(string.match(s, ":.-(%d+)%%"))
       volume_now.muted = string.match(s, "muted: (%S+)")
 
-      if scallback then pulseaudio.sink = scallback() end
-
       widget = pulseaudio.widget
       settings()
    end
 
-   newtimer(string.format("pulseaudio-%s", pulseaudio.sink), timeout, pulseaudio.update)
+   newtimer(string.format("pulseaudio-%s", timeout), timeout, pulseaudio.update)
 
    return setmetatable(pulseaudio, { __index = pulseaudio.widget })
 end