]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/alsa.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:

merging with upstream
[etc/awesome.git] / widgets / alsa.lua
index 114e2b2744d5cfc9bad45ef2cfa444d370ae4145..85d53114e132a683fe2af8af9f86908af61b8f39 100644 (file)
@@ -8,11 +8,12 @@
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
+local read_pipe       = require("lain.helpers").read_pipe
 
 local wibox           = require("wibox")
 
 
 local wibox           = require("wibox")
 
-local io              = { popen  = io.popen }
-local string          = { match  = string.match }
+local string          = { match  = string.match,
+                          format = string.format }
 
 local setmetatable    = setmetatable
 
 
 local setmetatable    = setmetatable
 
@@ -23,15 +24,15 @@ local alsa = {}
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
-    local channel  = args.channel or "Master -c 1"
     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 
+    alsa.cmd     = args.cmd or "amixer"
+    alsa.channel = args.channel or "Master"
+
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()
-        local f = assert(io.popen('amixer get ' .. channel))
-        local mixer = f:read("*all")
-        f:close()
+        local mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
 
         volume_now = {}
 
 
         volume_now = {}
 
@@ -57,7 +58,9 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 
-    newtimer("alsa", timeout, alsa.update)
+    timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
+
+    newtimer(timer_id, timeout, alsa.update)
 
     return setmetatable(alsa, { __index = alsa.widget })
 end
 
     return setmetatable(alsa, { __index = alsa.widget })
 end