Merge pull request #97 from mvalkon/card_attr

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 3e025bbd252712f8f152e65c5a6fc783ffe8348c..5a4335e63b7624a61f49389d0c4d21f252dd99a1 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -1,10 +1,10 @@
 
 --[[
 
 --[[

-                                                      
-     Licensed under GNU General Public License v2     
-      * (c) 2013, Luke Bonham                         
-      * (c) 2010, Adrian C. <anrxc@sysphere.org>      
-                                                      
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013, Luke Bonham                     
+      * (c) 2010, Adrian C. <anrxc@sysphere.org>  
+                                                  

 --]]
 
 local newtimer        = require("lain.helpers").newtimer
 --]]
 
 local newtimer        = require("lain.helpers").newtimer


@@ -12,7 +12,8 @@ local newtimer        = require("lain.helpers").newtimer
 local wibox           = require("wibox")
 
 local io              = { popen  = io.popen }
 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
 


@@ -22,6 +23,7 @@ local alsa = {}
 
 local function worker(args)
     local args     = args or {}
 
 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"
     local settings = args.settings or function() end
     local timeout  = args.timeout or 5
     local channel  = args.channel or "Master"
     local settings = args.settings or function() end


@@ -29,8 +31,8 @@ local function worker(args)
     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")
+        local f = assert(io.popen(string.format("amixer -c %s -M get %s", card, channel)))
+        local mixer = f:read("*a")

         f:close()
 
         volume_now = {}
         f:close()
 
         volume_now = {}