]> 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:

Allow multiple instances of the pulseaudio widget
authorCalvin Timmer <calvin.timmer@mailbox.org>
Thu, 2 Feb 2017 13:37:43 +0000 (14:37 +0100)
committercopycat-killer <dada@archlinux.info>
Fri, 3 Feb 2017 20:19:49 +0000 (21:19 +0100)
Enable switching between default sink or source in pulseaudio widget

widgets/pulseaudio.lua
wiki

index 68d3066f1009b813f992ae7e74d3f73de7d955a5..590bd0f883890d130f4adffd3a2e6e3924903f33 100644 (file)
@@ -16,46 +16,47 @@ local setmetatable = setmetatable
 
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
 
 -- PulseAudio volume
 -- lain.widgets.pulseaudio
-local pulseaudio = {}
 
 local function worker(args)
 
 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
+    local pulseaudio = { 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-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'"
+    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'"
 
 
-   pulseaudio.widget = wibox.widget.textbox()
+    function pulseaudio.update()
+        if scallback then pulseaudio.cmd = scallback() end
 
 
-   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"
+            }
 
 
-      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
 
 
-          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"
 
 
-          volume_now.left  = volume_now.channel[1] or "N/A"
-          volume_now.right = volume_now.channel[2] or "N/A"
+            widget = pulseaudio.widget
 
 
-          widget = pulseaudio.widget
-          settings()
-      end)
-   end
+            settings()
+        end)
+    end
 
 
-   helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
+    helpers.newtimer("pulseaudio", timeout, pulseaudio.update)
 
 
-   return pulseaudio
+    return pulseaudio
 end
 
 end
 
-return setmetatable(pulseaudio, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })
diff --git a/wiki b/wiki
index e2ce961ae4ba86f373d26b79b7e7b4891e1a9aa9..af671ad9bb1ce9c7bb74a75f489a3b5d0a934558 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit e2ce961ae4ba86f373d26b79b7e7b4891e1a9aa9
+Subproject commit af671ad9bb1ce9c7bb74a75f489a3b5d0a934558