pulseaudio: added sink name; fixed typo; #234

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index 4bda3c5a8555b04b3b96552eeef19a10c256814f..15bea8b3bddfc08b3baa6142b5de775a1afa97d1 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -26,7 +26,7 @@ local function worker(args)
    local settings    = args.settings or function() end
    local scallback   = args.scallback
 
    local settings    = args.settings or function() end
    local scallback   = args.scallback
 

-   pulseaudio.cmd    = args.cmd or string.format("pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p'")
+   pulseaudio.cmd    = args.cmd or string.format("pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'")

    pulseaudio.widget = wibox.widget.textbox('')
 
    function pulseaudio.update()
    pulseaudio.widget = wibox.widget.textbox('')
 
    function pulseaudio.update()


@@ -34,7 +34,8 @@ local function worker(args)
       local s = read_pipe(pulseaudio.cmd)
 
       volume_now = {}
       local s = read_pipe(pulseaudio.cmd)
 
       volume_now = {}

-      volume.now.index = string.match(s, "index: (%S+)") or "N/A"
+      volume_now.index = string.match(s, "index: (%S+)") or "N/A"
+      volume_now.sink  = string.match(s, "device.string = \"(%S+)\"") or "N/A"

       volume_now.muted = string.match(s, "muted: (%S+)") or "N/A"
 
       local ch = 1
       volume_now.muted = string.match(s, "muted: (%S+)") or "N/A"
 
       local ch = 1