X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8d3868d7ce528cfc075e246c8935bae2724e0868..a5d68067cfa5759bf55576784563092b5ca5629f:/widget/pulsebar.lua?ds=sidebyside

diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua
index fede5ba..74765f5 100644
--- a/widget/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -33,7 +33,7 @@ local pulsebar = {
     _muted         = false
 }
 
-local function worker(args)
+local function factory(args)
     local args       = args or {}
     local timeout    = args.timeout or 5
     local settings   = args.settings or function() end
@@ -41,7 +41,6 @@ local function worker(args)
     local height     = args.heigth or 1
     local ticks      = args.ticks or false
     local ticks_size = args.ticks_size or 7
-    local vertical   = args.vertical or false
     local scallback  = args.scallback
 
     pulsebar.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'"
@@ -49,6 +48,7 @@ local function worker(args)
     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      = {}
@@ -65,7 +65,6 @@ local function worker(args)
         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar,
-        layout           = vertical and wibox.container.rotate
     }
 
     pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } })
@@ -80,6 +79,8 @@ local function worker(args)
                 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
@@ -145,4 +146,4 @@ local function worker(args)
     return pulsebar
 end
 
-return setmetatable(pulsebar, { __call = function(_, ...) return worker(...) end })
+return setmetatable(pulsebar, { __call = function(_, ...) return factory(...) end })