Merge branch 'master' of https://github.com/trap000d/lain into trap000d-master

[etc/awesome.git] / widgets / pulseaudio.lua

diff --git a/widgets/pulseaudio.lua b/widgets/pulseaudio.lua
index 3178dcfc12f4be9fbc42008f2093692dafb667b6..05ef337deb8dbe350d6d625f559a6b9d15d3e940 100644 (file)
--- a/widgets/pulseaudio.lua
+++ b/widgets/pulseaudio.lua
@@ -16,45 +16,47 @@ local setmetatable = setmetatable
 
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
-local pulseaudio = {}
 
 local function worker(args)
-   local args        = args or {}
-   local timeout     = args.timeout or 5
-   local settings    = args.settings or function() end
-   local scallback   = args.scallback
-
-   pulseaudio.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'"
-   pulseaudio.widget = wibox.widget.textbox()
-
-   function pulseaudio.update()
-      if scallback then pulseaudio.cmd = scallback() end
-
-      helpers.async({ shell, "-c", pulseaudio.cmd }, function(s)
-          volume_now = {
-              index = string.match(s, "index: (%S+)") or "N/A",
-              sink  = string.match(s, "device.string = \"(%S+)\"") or "N/A",
-              muted = string.match(s, "muted: (%S+)") or "N/A"
-          }
-
-          local ch = 1
-          volume_now.channel = {}
-          for v in string.gmatch(s, ":.-(%d+)%%") do
-              volume_now.channel[ch] = v
-              ch = ch + 1
-          end
-
-          volume_now.left  = volume_now.channel[1] or "N/A"
-          volume_now.right = volume_now.channel[2] or "N/A"
-
-          widget = pulseaudio.widget
-          settings()
-      end)
-   end
-
-   helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
-
-   return setmetatable(pulseaudio, { __index = pulseaudio.widget })
+    local pulseaudio = { widget = wibox.widget.textbox() }
+    local args        = args or {}
+    local devicetype  = args.devicetype or "sink"
+    local timeout     = args.timeout or 5
+    local settings    = args.settings or function() end
+    local scallback   = args.scallback
+
+    pulseaudio.cmd    = args.cmd or "pacmd list-" .. devicetype .. "s | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
+
+    function pulseaudio.update()
+        if scallback then pulseaudio.cmd = scallback() end
+
+        helpers.async({ shell, "-c", pulseaudio.cmd }, function(s)
+            volume_now = {
+                index = string.match(s, "index: (%S+)") or "N/A",
+                device = string.match(s, "device.string = \"(%S+)\"") or "N/A",
+                sink   = device, -- legacy API
+                muted  = string.match(s, "muted: (%S+)") or "N/A"
+            }
+
+            local ch = 1
+            volume_now.channel = {}
+            for v in string.gmatch(s, ":.-(%d+)%%") do
+                volume_now.channel[ch] = v
+                ch = ch + 1
+            end
+
+            volume_now.left  = volume_now.channel[1] or "N/A"
+            volume_now.right = volume_now.channel[2] or "N/A"
+
+            widget = pulseaudio.widget
+
+            settings()
+        end)
+    end
+
+    helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
+
+    return pulseaudio
 end
 
-return setmetatable(pulseaudio, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })