counter pull #344: don't rely on awful.layout.layouts array, but point directly to...

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

diff --git a/widget/pulseaudio.lua b/widget/pulseaudio.lua
index 6c1344d7539f44dbb65fb8f54fb9dc6645bd3d83..ed37cb5e96fbd580d70bef55a0b783f3582fdab7 100644 (file)
--- a/widget/pulseaudio.lua
+++ b/widget/pulseaudio.lua
@@ -17,14 +17,15 @@ local string  = { gmatch = string.gmatch,
 -- lain.widget.pulseaudio
 
 local function factory(args)
 -- lain.widget.pulseaudio
 
 local function factory(args)

-    local pulseaudio = { widget = wibox.widget.textbox() }
+    local pulseaudio  = { widget = wibox.widget.textbox() }

     local args        = args or {}
     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
     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
 
     function pulseaudio.update()
         if scallback then pulseaudio.cmd = scallback() end


@@ -37,6 +38,8 @@ local function factory(args)
                 muted  = string.match(s, "muted: (%S+)") or "N/A"
             }
 
                 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
             local ch = 1
             volume_now.channel = {}
             for v in string.gmatch(s, ":.-(%d+)%%") do