]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/pulseaudio.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

modified: widgets/weather.lua - seems fixed datetime calculation
[etc/awesome.git] / widgets / pulseaudio.lua
index 3ce98d47b2624aec9f05b0f0d8ff44d92131d233..17fdb9c2c24266871eb702b88fb443dd4f7089ae 100644 (file)
@@ -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