Add a card attribute for alsa and alsabar

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 114e2b2744d5cfc9bad45ef2cfa444d370ae4145..5a4335e63b7624a61f49389d0c4d21f252dd99a1 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -12,7 +12,8 @@ local newtimer        = require("lain.helpers").newtimer
 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
 
@@ -22,15 +23,16 @@ local alsa = {}
 
 local function worker(args)
     local args     = args or {}
+    local card     = args.card or "0"
     local timeout  = args.timeout or 5
-    local channel  = args.channel or "Master -c 1"
+    local channel  = args.channel or "Master"
     local settings = args.settings or function() end
 
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()
-        local f = assert(io.popen('amixer get ' .. channel))
-        local mixer = f:read("*all")
+        local f = assert(io.popen(string.format("amixer -c %s -M get %s", card, channel)))
+        local mixer = f:read("*a")
         f:close()
 
         volume_now = {}