fix #300

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

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index 3ce98d47b2624aec9f05b0f0d8ff44d92131d233..68d3066f1009b813f992ae7e74d3f73de7d955a5 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -6,16 +6,14 @@
                                                   
 --]]
 
-local read_pipe       = require("lain.helpers").read_pipe
-local newtimer        = require("lain.helpers").newtimer
-local wibox           = require("wibox")
+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 string          = { match  = string.match,
-                          format = string.format }
-
-local setmetatable    = setmetatable
-
-local naughty = require("naughty")
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
 local pulseaudio = {}
@@ -26,26 +24,38 @@ local function worker(args)
    local settings    = args.settings or function() end
    local scallback   = args.scallback
 
-   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('')
-
-   function pulseaudio.update()
-      local s = read_pipe(pulseaudio.cmd)
-
-      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+)")
+   pulseaudio.cmd    = args.cmd or "pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
 
-      if scallback then pulseaudio.sink = scallback() end
+   pulseaudio.widget = wibox.widget.textbox()
 
-      widget = pulseaudio.widget
-      settings()
+   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",
+              sink  = string.match(s, "device.string = \"(%S+)\"") or "N/A",
+              muted = string.match(s, "muted: (%S+)") or "N/A"
+          }
+
+          local ch = 1
+          volume_now.channel = {}
+          for v in string.gmatch(s, ":.-(%d+)%%") do
+              volume_now.channel[ch] = v
+              ch = ch + 1
+          end
+
+          volume_now.left  = volume_now.channel[1] or "N/A"
+          volume_now.right = volume_now.channel[2] or "N/A"
+
+          widget = pulseaudio.widget
+          settings()
+      end)
    end
 
-   newtimer(string.format("pulseaudio-%s", pulseaudio.sink), timeout, pulseaudio.update)
+   helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
 
-   return setmetatable(pulseaudio, { __index = pulseaudio.widget })
+   return pulseaudio
 end
 
 return setmetatable(pulseaudio, { __call = function(_, ...) return worker(...) end })