wiki updated

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 20a678efb4f8411285d866b096bbe6121e0be7e6..6a03a1079c55c3b66a32e2eadb4f11d5cc3b6f07 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -16,7 +16,6 @@ local string       = { format = string.format,
                        match  = string.match,
                        rep    = string.rep }
 local tonumber     = tonumber
-local type         = type
 local setmetatable = setmetatable
 
 -- ALSA volume bar
@@ -33,14 +32,14 @@ local alsabar = {
 }
 
 local function worker(args)
-    local args         = args or {}
-    local timeout      = args.timeout or 5
-    local settings     = args.settings or function() end
-    local width        = args.width or 63
-    local height       = args.height or 1
-    local ticks        = args.ticks or false
-    local ticks_size   = args.ticks_size or 7
-    local vertical     = args.vertical or false
+    local args       = args or {}
+    local timeout    = args.timeout or 5
+    local settings   = args.settings or function() end
+    local width      = args.width or 63
+    local height     = args.height or 1
+    local ticks      = args.ticks or false
+    local ticks_size = args.ticks_size or 7
+    local vertical   = args.vertical or false
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"
@@ -69,11 +68,10 @@ local function worker(args)
 
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
-    function alsabar.update(callback)
+    function alsabar.update()
         helpers.async(alsabar.cmd, function(mixer)
             local volu,mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
-            if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted)
-            then
+            if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted) then
                 alsabar._current_level = tonumber(volu) or alsabar._current_level
                 alsabar.bar:set_value(alsabar._current_level / 100)
                 if (not mute and tonumber(volu) == 0) or mute == "off" then
@@ -91,8 +89,6 @@ local function worker(args)
                 volume_now.status = mute
 
                 settings()
-
-                if type(callback) == "function" then callback() end
             end
         end)
     end
@@ -113,12 +109,10 @@ local function worker(args)
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 
-            if alsabar._notify == "on" then
-                alsabar.id = naughty.notify ({
-                    replaces_id = alsabar.id,
-                    preset      = preset
-                }).id
-            end
+            alsabar.id = naughty.notify ({
+                replaces_id = alsabar.id,
+                preset      = preset
+            }).id
         end)
     end