pulsebar: fix typos; closes #327

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

diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua
index caaffdc0a9bee9c2d1fb73d5209d80e03b9fe998..e80a25194820265fc267ebb019aac3dafc892afd 100644 (file)
--- a/widget/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -41,7 +41,6 @@ local function factory(args)
     local height     = args.heigth or 1
     local ticks      = args.ticks or false
     local ticks_size = args.ticks_size or 7
     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'"
     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 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

+    pulsebar.device        = "N/A"

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


@@ -65,13 +65,12 @@ local function factory(args)
         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar,
         ticks            = ticks,
         ticks_size       = ticks_size,
         widget           = wibox.widget.progressbar,

-        layout           = vertical and wibox.container.rotate

     }
 
     pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } })
 
     function pulsebar.update(callback)
     }
 
     pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } })
 
     function pulsebar.update(callback)

-        if scallback then pulseaudio.cmd = scallback() end
+        if scallback then pulsebar.cmd = scallback() end

 
         helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s)
             volume_now = {
 
         helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s)
             volume_now = {


@@ -80,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"
             }
 

+            pulsebar.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