layout: deprecations removed; submodule compacted

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index bb549428601ca5cc4a3b913781d88fc639e3095e..670765acf826e21ffd8a2454fbb08e1657464186 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -7,36 +7,43 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer        = require("lain.helpers").newtimer
-local read_pipe       = require("lain.helpers").read_pipe
+local helpers      = require("lain.helpers")
+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

-local alsa = { last_level = "0", last_status = "off" }
+local alsa = helpers.make_widget_textbox()

 
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
 
 
 local function worker(args)
     local args     = args or {}
     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.last_level    = "0"
+    alsa.last_status   = ""

 
     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,10 +52,9 @@ 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)

+    helpers.newtimer(timer_id, timeout, alsa.update)

 
 

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

 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })