#308 fix

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

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index c2686d8fee97291d4c3e1c9f145689fbe38b2130..590bd0f883890d130f4adffd3a2e6e3924903f33 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -6,44 +6,57 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local read_pipe    = require("lain.helpers").read_pipe
-local newtimer     = require("lain.helpers").newtimer
+local helpers      = require("lain.helpers")
+local shell        = require("awful.util").shell

 local wibox        = require("wibox")
 local wibox        = require("wibox")

-
-local string       = { match  = string.match,
+local string       = { gmatch = string.gmatch,
+                       match  = string.match,

                        format = string.format }
                        format = string.format }

-

 local setmetatable = setmetatable
 
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
 local setmetatable = setmetatable
 
 -- PulseAudio volume
 -- lain.widgets.pulseaudio

-local pulseaudio = {}

 
 local function worker(args)
 
 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
+    local pulseaudio = { 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'"
+
+    function pulseaudio.update()
+        if scallback then pulseaudio.cmd = scallback() end
+
+        helpers.async({ shell, "-c", pulseaudio.cmd }, function(s)
+            volume_now = {
+                index = string.match(s, "index: (%S+)") or "N/A",
+                device = string.match(s, "device.string = \"(%S+)\"") or "N/A",
+                sink   = device, -- legacy API
+                muted  = string.match(s, "muted: (%S+)") or "N/A"
+            }

 
 

-   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('')
+            local ch = 1
+            volume_now.channel = {}
+            for v in string.gmatch(s, ":.-(%d+)%%") do
+                volume_now.channel[ch] = v
+                ch = ch + 1
+            end

 
 

-   function pulseaudio.update()
-      if scallback then pulseaudio.cmd = scallback() end
-      local s = read_pipe(pulseaudio.cmd)
+            volume_now.left  = volume_now.channel[1] or "N/A"
+            volume_now.right = volume_now.channel[2] or "N/A"

 
 

-      volume_now = {}
-      volume_now.left  = tonumber(string.match(s, ":.-(%d+)%%"))
-      volume_now.right = tonumber(string.match(s, ":.-(%d+)%%"))
-      volume_now.muted = string.match(s, "muted: (%S+)")
+            widget = pulseaudio.widget

 
 

-      widget = pulseaudio.widget
-      settings()
-   end
+            settings()
+        end)
+    end

 
 

-   newtimer(string.format("pulseaudio-%s", timeout), timeout, pulseaudio.update)
+    helpers.newtimer("pulseaudio", timeout, pulseaudio.update)

 
 

-   return setmetatable(pulseaudio, { __index = pulseaudio.widget })
+    return pulseaudio

 end
 
 end
 

-return setmetatable(pulseaudio, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })