]> git.madduck.net Git - etc/awesome.git/blobdiff - widget/pulsebar.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

pulsebar: fix typos; closes #327
[etc/awesome.git] / widget / pulsebar.lua
index caaffdc0a9bee9c2d1fb73d5209d80e03b9fe998..e80a25194820265fc267ebb019aac3dafc892afd 100644 (file)
@@ -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 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 factory(args)
     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      = {}
@@ -65,13 +65,12 @@ local function factory(args)
         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)
-        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 = {
@@ -80,6 +79,8 @@ local function factory(args)
                 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