#263 fix

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 114e2b2744d5cfc9bad45ef2cfa444d370ae4145..670765acf826e21ffd8a2454fbb08e1657464186 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -7,59 +7,54 @@
                                                   
 --]]
 
                                                   
 --]]
 

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

 
 

-local wibox           = require("wibox")
+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

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

-local alsa = {}
+local alsa = helpers.make_widget_textbox()

 
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5
 
 local function worker(args)
     local args     = args or {}
     local timeout  = args.timeout or 5

-    local channel  = args.channel or "Master -c 1"

     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 

-    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()
 
     function alsa.update()

-        local f = assert(io.popen('amixer get ' .. channel))
-        local mixer = f:read("*all")
-        f:close()
+        mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
+        l, s  = string.match(mixer, "([%d]+)%%.*%[([%l]*)")

 
 

-        volume_now = {}
-
-        volume_now.level, volume_now.status = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
-
-        if volume_now.level == nil
-        then
-            volume_now.level  = "0"
-            volume_now.status = "off"
+        -- 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
 
         end
 

-        if volume_now.status == ""
-        then
-            if volume_now.level == "0"
-            then
-                volume_now.status = "off"
-            else
-                volume_now.status = "on"
-            end
-        end
+        if alsa.last_level ~= l or alsa.last_status ~= s then
+            volume_now = { level = l, status = s }
+            alsa.last_level  = l
+            alsa.last_status = s

 
 

-        widget = alsa.widget
-        settings()
+            widget = alsa.widget
+            settings()
+        end

     end
 
     end
 

-    newtimer("alsa", timeout, alsa.update)
+    timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
+    helpers.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 })