Merge remote-tracking branch 'upstream/master'

[etc/awesome.git] / widgets / pulseaudio.lua

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index 3ce98d47b2624aec9f05b0f0d8ff44d92131d233..17fdb9c2c24266871eb702b88fb443dd4f7089ae 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -15,7 +15,6 @@ local string          = { match  = string.match,
 
 local setmetatable    = setmetatable
 
 
 local setmetatable    = setmetatable
 

-local naughty = require("naughty")

 -- PulseAudio volume
 -- lain.widgets.pulseaudio
 local pulseaudio = {}
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
 local pulseaudio = {}


@@ -30,6 +29,7 @@ local function worker(args)
    pulseaudio.widget = wibox.widget.textbox('')
 
    function pulseaudio.update()
    pulseaudio.widget = wibox.widget.textbox('')
 
    function pulseaudio.update()

+      if scallback then pulseaudio.cmd = scallback() end

       local s = read_pipe(pulseaudio.cmd)
 
       volume_now = {}
       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+)")
 
       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
 
       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
 
    return setmetatable(pulseaudio, { __index = pulseaudio.widget })
 end