Merge pull request #255 from wimstefan/master

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

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index 589249ffe70d0904e05737961d8cb6fa1dd9203e..15bea8b3bddfc08b3baa6142b5de775a1afa97d1 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -6,14 +6,15 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local read_pipe       = require("lain.helpers").read_pipe
-local newtimer        = require("lain.helpers").newtimer
-local wibox           = require("wibox")
+local read_pipe    = require("lain.helpers").read_pipe
+local newtimer     = require("lain.helpers").newtimer
+local wibox        = require("wibox")

 
 

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

 
 

-local setmetatable    = setmetatable
+local setmetatable = setmetatable

 
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
 
 -- PulseAudio volume
 -- lain.widgets.pulseaudio


@@ -23,25 +24,35 @@ local function worker(args)
    local args        = args or {}
    local timeout     = args.timeout or 5
    local settings    = args.settings or function() end
    local args        = args or {}
    local timeout     = args.timeout or 5
    local settings    = args.settings or function() end

+   local scallback   = args.scallback

 
 

-   pulseaudio.sink   = args.sink or 0 -- user defined or first one
-   pulseaudio.cmd    = args.cmd or string.format("pacmd list-sinks | sed -n -e '/base volume/d' -e '/index: %d/p' -e '/volume:/p' -e '/muted:/p' | sed -n -e '/index: %d/,+2p'",
-                       pulseaudio.sink, pulseaudio.sink)
+   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' -e '/device\\.string/p'")

    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 = {}

-      volume_now.left  = tonumber(string.match(s, "left.-(%d+)%%")) or tonumber(string.match(s, "0:.-(%d+)%%"))
-      volume_now.right = tonumber(string.match(s, "right.-(%d+)%%")) or tonumber(string.match(s, "1:.-(%d+)%%"))
-      volume_now.muted = string.match(s, "muted: (%S+)")
+      volume_now.index = string.match(s, "index: (%S+)") or "N/A"
+      volume_now.sink  = string.match(s, "device.string = \"(%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()
    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