fix and complete pull #286

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

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index 7c269086a8f9d3d8948255e8a68c919d8af54d90..93c74ccb0246d34c8820dc16707feb73a7686582 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -1,101 +1,54 @@
 
 --[[
-                                                      
-     Licensed under GNU General Public License v2     
-      * (c) 2013,      Luke Bonham                    
-      * (c) 2010-2012, Peter Hofmann                  
-      * (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 markup          = require("lain.util.markup")
-local run_in_terminal = require("lain.helpers").run_in_terminal
+local helpers      = require("lain.helpers")
+local shell        = require("awful.util").shell
+local wibox        = require("wibox")
+local string       = { match  = string.match,
+                       format = string.format }
+local setmetatable = setmetatable
 
-local awful           = require("awful")
-local beautiful       = require("beautiful")
-local wibox           = require("wibox")
+-- ALSA volume
+-- lain.widgets.alsa
+local alsa = helpers.make_widget_textbox()
 
-local io              = io
-local string          = { format = string.format,
-                          match  = string.match }
+local function worker(args)
+    local args     = args or {}
+    local timeout  = args.timeout or 5
+    local settings = args.settings or function() end
 
-local setmetatable    = setmetatable
+    alsa.cmd           = args.cmd or "amixer"
+    alsa.channel       = args.channel or "Master"
+    alsa.togglechannel = args.togglechannel
 
--- ALSA volume infos
--- nain.widgets.alsa
-local alsa = {
-    volume = 0,
-    mute = false,
-}
+    local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel)
 
-function worker(args)
-    local args = args or {}
-    local channel = args.channel or "Master"
-    local step = args.step or "1%"
-    local header = args.header or " Vol "
-    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
-    local color = args.color or beautiful.fg_focus or "#FFFFFF"
-
-    local myvolume = wibox.widget.textbox()
-    local myvolumeupdate = function()
-        local f = io.popen('amixer get ' .. channel)
-        local mixer = f:read("*all")
-        f:close()
-
-        local volume, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
-
-        if volume == nil
-        then
-            alsa.volume = 0
-        else
-            alsa.volume = volume
-        end
-
-        if mute == nil or mute == 'on'
-        then
-            alsa.mute = true
-            mute = ''
-        else
-            alsa.mute = false
-            mute = 'M'
-        end
-
-        local ret = markup(color, string.format("%d%s", volume, mute))
-        myvolume:set_markup(markup(header_color, header) .. ret .. " ")
+    if alsa.togglechannel then
+        format_cmd = { shell, "-c", string.format("%s get %s; %s get %s",
+        alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) }
     end
 
-    local myvolumetimer = timer({ timeout = 5 })
-    myvolumetimer:connect_signal("timeout", myvolumeupdate)
-    myvolumetimer:start()
-    myvolumetimer:emit_signal("timeout")
-
-    myvolume:buttons(awful.util.table.join(
-        awful.button({}, 1,
-            function()
-                run_in_terminal('alsamixer')
-             end),
-        awful.button({}, 3,
-            function()
-                awful.util.spawn('amixer sset ' .. channel ' toggle')
-            end),
-
-        awful.button({}, 4,
-            function()
-                awful.util.spawn('amixer sset ' .. channel .. ' ' .. step '+')
-                myvolumeupdate()
-            end),
-
-        awful.button({}, 5,
-            function()
-                awful.util.spawn('amixer sset ' .. channel .. ' ' .. step '-')
-                myvolumeupdate()
-            end)
-    ))
+    alsa.last = {}
+
+    function alsa.update()
+        helpers.async(format_cmd, function(mixer)
+            local l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
+            if alsa.last.level ~= l or alsa.last.status ~= s then
+                volume_now = { level = l, status = s }
+                widget = alsa.widget
+                settings()
+                alsa.last = volume_now
+            end
+        end)
+    end
 
-    alsa.widget = myvolume
-    alsa.channel = channel
-    alsa.step = step
-    alsa.notify = myvolumeupdate
+    helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)
 
     return setmetatable(alsa, { __index = alsa.widget })
 end