Add devicetype to pulsbar to match pulseaudio and update sed command

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

diff --git a/widget/pulseaudio.lua b/widget/pulseaudio.lua
index b0946a17c2a6b61f98d33b252e491c478ecbe29c..f9a2302f378052553927f60bde80e2f7502730d6 100644 (file)
--- a/widget/pulseaudio.lua
+++ b/widget/pulseaudio.lua
@@ -1,9 +1,8 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2016, Luke Bonham                     
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2016, Luke Bonham
+
 --]]
 
 local helpers = require("lain.helpers")
@@ -17,15 +16,15 @@ local string  = { gmatch = string.gmatch,
 -- lain.widget.pulseaudio
 
 local function factory(args)
-    local pulseaudio = { widget = wibox.widget.textbox() }
+    local pulseaudio  = { widget = wibox.widget.textbox() }
     local args        = args or {}
     local timeout     = args.timeout or 5
     local settings    = args.settings or function() end
     local scallback   = args.scallback
- 
+
     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'"
+    pulseaudio.cmd = args.cmd or "pacmd list-" .. pulseaudio.devicetype .. "s | sed -n -e '/*/,$!d' -e '/index/p' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
 
     function pulseaudio.update()
         if scallback then pulseaudio.cmd = scallback() end