Merge pull request #286 from aajjbb/fix-alsa-channel

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

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index 4bda3c5a8555b04b3b96552eeef19a10c256814f..3178dcfc12f4be9fbc42008f2093692dafb667b6 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -6,14 +6,12 @@
                                                   
 --]]
 
                                                   
 --]]
 

-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       = { gmatch = string.gmatch,
                        match  = string.match,
                        format = string.format }
 local string       = { gmatch = string.gmatch,
                        match  = string.match,
                        format = string.format }

-

 local setmetatable = setmetatable
 
 -- PulseAudio volume
 local setmetatable = setmetatable
 
 -- PulseAudio volume


@@ -26,32 +24,35 @@ local function worker(args)
    local settings    = args.settings or function() end
    local scallback   = args.scallback
 
    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('')
+   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'"
+   pulseaudio.widget = wibox.widget.textbox()

 
    function pulseaudio.update()
       if scallback then pulseaudio.cmd = scallback() end
 
    function pulseaudio.update()
       if scallback then pulseaudio.cmd = scallback() end

-      local s = read_pipe(pulseaudio.cmd)
-
-      volume_now = {}
-      volume.now.index = string.match(s, "index: (%S+)") or "N/A"
-      volume_now.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()
+      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
 
    end
 

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

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