]> git.madduck.net Git - etc/awesome.git/blobdiff - widget/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:

widgets: no global tables, but one instance per call; closes #336; closes #337
[etc/awesome.git] / widget / pulseaudio.lua
index 44694d1773449dcd546fdd416c313a4315947c09..ed37cb5e96fbd580d70bef55a0b783f3582fdab7 100644 (file)
@@ -6,26 +6,26 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
-local shell        = require("awful.util").shell
-local wibox        = require("wibox")
-local string       = { gmatch = string.gmatch,
-                       match  = string.match,
-                       format = string.format }
-local setmetatable = setmetatable
+local helpers = require("lain.helpers")
+local shell   = require("awful.util").shell
+local wibox   = require("wibox")
+local string  = { gmatch = string.gmatch,
+                  match  = string.match,
+                  format = string.format }
 
 -- PulseAudio volume
 -- lain.widget.pulseaudio
 
-local function worker(args)
-    local pulseaudio = { widget = wibox.widget.textbox() }
+local function factory(args)
+    local pulseaudio  = { widget = wibox.widget.textbox() }
     local args        = args or {}
-    local devicetype  = args.devicetype or "sink"
     local timeout     = args.timeout or 5
     local settings    = args.settings or function() end
     local scallback   = args.scallback
-
-    pulseaudio.cmd    = args.cmd or "pacmd list-" .. devicetype .. "s | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
+    pulseaudio.device = "N/A"
+    pulseaudio.devicetype = args.devicetype or "sink"
+    pulseaudio.cmd = args.cmd or "pacmd list-" .. pulseaudio.devicetype .. "s | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
 
     function pulseaudio.update()
         if scallback then pulseaudio.cmd = scallback() end
@@ -38,6 +38,8 @@ local function worker(args)
                 muted  = string.match(s, "muted: (%S+)") or "N/A"
             }
 
+            pulseaudio.device = volume_now.index
+
             local ch = 1
             volume_now.channel = {}
             for v in string.gmatch(s, ":.-(%d+)%%") do
@@ -59,4 +61,4 @@ local function worker(args)
     return pulseaudio
 end
 
-return setmetatable({}, { __call = function(_, ...) return worker(...) end })
+return factory