add .device for pulseaudio and pulsebar; wiki updated; closes #323

diff --git a/widget/pulseaudio.lua b/widget/pulseaudio.lua
index 6c1344d7539f44dbb65fb8f54fb9dc6645bd3d83..b0946a17c2a6b61f98d33b252e491c478ecbe29c 100644 (file)
--- a/widget/pulseaudio.lua
+++ b/widget/pulseaudio.lua
@@ -19,12 +19,13 @@ local string  = { gmatch = string.gmatch,
 local function factory(args)
     local pulseaudio = { widget = wibox.widget.textbox() }
     local args        = args or {}
 local function factory(args)
     local pulseaudio = { widget = 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
     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

diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua
index e96658b0ee02f6dd2e18036cf1d013497ac21ec9..74765f512f5988e6d0c99b76c4d8620c787f9418 100644 (file)
--- a/widget/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -48,6 +48,7 @@ local function factory(args)
     pulsebar.colors        = args.colors or pulsebar.colors
     pulsebar.followtag     = args.followtag or false
     pulsebar.notifications = args.notification_preset
     pulsebar.colors        = args.colors or pulsebar.colors
     pulsebar.followtag     = args.followtag or false
     pulsebar.notifications = args.notification_preset

+    pulseaudio.device      = "N/A"

 
     if not pulsebar.notification_preset then
         pulsebar.notification_preset      = {}
 
     if not pulsebar.notification_preset then
         pulsebar.notification_preset      = {}


@@ -78,6 +79,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

diff --git a/wiki b/wiki
index 9a0c9808e8054e5cc31d1293608f052a3b2d9f25..b1fd3487839584af9accc28a73a6aac7914d6b45 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 9a0c9808e8054e5cc31d1293608f052a3b2d9f25
+Subproject commit b1fd3487839584af9accc28a73a6aac7914d6b45