#112: custom echo cmd added

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 7d250962374a2df2c78180bae4fbadbf092c183c..91bf488290b7824a7b651f99f00f1098bb869546 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -26,14 +26,14 @@ local function worker(args)
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 

-    alsa.card    = args.card or "0"
+    alsa.cmd     = args.cmd or "amixer"

     alsa.channel = args.channel or "Master"
 
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()
     alsa.channel = args.channel or "Master"
 
     alsa.widget = wibox.widget.textbox('')
 
     function alsa.update()

-        local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsa.card, alsa.channel)))
-        local mixer = f:read("*a")
+        local f = assert(io.popen(string.format("%s get %s", alsa.cmd, alsa.channel)))
+        local mixer = f:read("*all")

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


@@ -60,7 +60,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