fixing typos

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index dba20e7bab53b87270d9fac1ce1c09fd58bc15b2..7500097b05eac9e0cc3bcc695d9f4b44551e5522 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -7,15 +7,15 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer        = require("lain.helpers").newtimer
-local read_pipe       = require("lain.helpers").read_pipe
+local newtimer     = require("lain.helpers").newtimer
+local read_pipe    = require("lain.helpers").read_pipe

 
 

-local wibox           = require("wibox")
+local wibox        = require("wibox")

 
 

-local string          = { match  = string.match,
-                          format = string.format }
+local string       = { match  = string.match,
+                       format = string.format }

 
 

-local setmetatable    = setmetatable
+local setmetatable = setmetatable

 
 -- ALSA volume
 -- lain.widgets.alsa
 
 -- ALSA volume
 -- lain.widgets.alsa


@@ -26,17 +26,23 @@ 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.cmd     = args.cmd or "amixer"
-    alsa.channel = args.channel or "Master"
-    alsa.widget  = wibox.widget.textbox('')
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel
+    alsa.widget        = wibox.widget.textbox('')

 
     function alsa.update()
         mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
 
     function alsa.update()
         mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))

-        l, s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+        l,s   = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+
+        -- HDMIs can have a channel different from Master for toggling mute
+        if alsa.togglechannel then
+            s = string.match(read_pipe(string.format("%s get %s", alsa.cmd, alsa.togglechannel)), "%[(%a+)%]")
+        end

 
         if alsa.last_level ~= l or alsa.last_status ~= s then
             volume_now = { level = l, status = s }
 
         if alsa.last_level ~= l or alsa.last_status ~= s then
             volume_now = { level = l, status = s }

-            alsa.last_level = l
+            alsa.last_level  = l

             alsa.last_status = s
 
             widget = alsa.widget
             alsa.last_status = s
 
             widget = alsa.widget


@@ -45,7 +51,6 @@ local function worker(args)
     end
 
     timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
     end
 
     timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)

-

     newtimer(timer_id, timeout, alsa.update)
 
     return setmetatable(alsa, { __index = alsa.widget })
     newtimer(timer_id, timeout, alsa.update)
 
     return setmetatable(alsa, { __index = alsa.widget })