]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

pulseaudio #168
authorcopycat-killer <dada@archlinux.info>
Fri, 19 Feb 2016 13:17:44 +0000 (14:17 +0100)
committercopycat-killer <dada@archlinux.info>
Fri, 19 Feb 2016 13:17:44 +0000 (14:17 +0100)
widgets/pulseaudio.lua

index b675276c0602f1ef25cf95abffae7f799c5cf984..17f91f36c5f86a06899c4d4d1337ed4e4b1eac3b 100644 (file)
@@ -25,15 +25,15 @@ local function worker(args)
    local settings    = args.settings or function() end
 
    pulseaudio.sink   = args.sink or 0 -- user defined or first one
-   pulseaudio.cmd    = args.cmd or string.format("pacmd list-sinks | grep -e 'index: %d' -e 'volume: front' -e 'muted'", pulseaudio.sink)
+   pulseaudio.cmd    = args.cmd or string.format("pacmd list-sinks | grep -e 'index: %d' -e 'volume:' -e 'muted'", pulseaudio.sink)
    pulseaudio.widget = wibox.widget.textbox('')
 
    function pulseaudio.update()
       local s = read_pipe(pulseaudio.cmd)
 
       volume_now = {}
-      volume_now.left  = tonumber(string.match(s, "left.-(%d+)%%"))
-      volume_now.right = tonumber(string.match(s, "right.-(%d+)%%"))
+      volume_now.left  = tonumber(string.match(s, "left.-(%d+)%%")) or tonumber(string.match(s, "0:.-(%d+)%%"))
+      volume_now.right = tonumber(string.match(s, "right.-(%d+)%%")) or tonumber(string.match(s, "1:.-(%d+)%%"))
       volume_now.muted = string.match(s, "muted: (%S+)")
 
       widget = pulseaudio.widget