cal: terminal-colors.d independent highlight matching pattern

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index fde5eec5e5a9a9b67dd6f79142fec98b36c415b0..c3e3d9d95b970e6000f34924f16acd13dc53502c 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -47,7 +47,6 @@ local function worker(args)
     alsabar.togglechannel       = args.togglechannel
     alsabar.colors              = args.colors or alsabar.colors
     alsabar.followtag           = args.followtag or false
-    alsabar._notify             = args.notify or "on"
     alsabar.notification_preset = args.notification_preset
 
     if not alsabar.notification_preset then
@@ -55,8 +54,10 @@ local function worker(args)
         alsabar.notification_preset.font = "Monospace 11"
     end
 
+    local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+
     if alsabar.togglechannel then
-        alsabar.cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
+        format_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
         alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) }
     end
 
@@ -76,7 +77,7 @@ local function worker(args)
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
 
     function alsabar.update(callback)
-        helpers.async(alsabar.cmd, function(mixer)
+        helpers.async(format_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
                 alsabar._current_level = tonumber(volu) or alsabar._current_level
@@ -125,9 +126,7 @@ local function worker(args)
         end)
     end
 
-    timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
-
-    helpers.newtimer(timer_id, timeout, alsabar.update)
+    helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)
 
     return alsabar
 end