fixing small typo in fs widget which lead to nil reference

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

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index b12e55cbb88608eeed7ec20980efecfd5ebab77d..8ec5a00ed036feadb410ee1235df3fea6be75eea 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -89,19 +89,19 @@ function alsabar.notify()
 end
 
 local function worker(args)
 end
 
 local function worker(args)

-    local args = args or {}
-    local timeout = args.timeout or 4
-    local settings = args.settings or function() end
-    local width = args.width or 63
-    local height = args.heigth or 1
-    local ticks = args.ticks or false
+    local args       = args or {}
+    local timeout    = args.timeout or 4
+    local settings   = args.settings or function() end
+    local width      = args.width or 63
+    local height     = args.heigth or 1
+    local ticks      = args.ticks or false

     local ticks_size = args.ticks_size or 7
     local ticks_size = args.ticks_size or 7

-    local vertical = args.vertical or false
+    local vertical   = args.vertical or false

 
 

-    alsabar.card = args.card or alsabar.card
-    alsabar.channel = args.channel or alsabar.channel
-    alsabar.step = args.step or alsabar.step
-    alsabar.colors = args.colors or alsabar.colors
+    alsabar.cmd           = args.cmd or "amixer"
+    alsabar.channel       = args.channel or alsabar.channel
+    alsabar.step          = args.step or alsabar.step
+    alsabar.colors        = args.colors or alsabar.colors

     alsabar.notifications = args.notifications or alsabar.notifications
 
     alsabar.bar = awful.widget.progressbar()
     alsabar.notifications = args.notifications or alsabar.notifications
 
     alsabar.bar = awful.widget.progressbar()


@@ -117,7 +117,7 @@ local function worker(args)
 
     function alsabar.update()
         -- Get mixer control contents
 
     function alsabar.update()
         -- Get mixer control contents

-        local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsabar.card, alsabar.channel)))
+        local f = assert(io.popen(string.format("%s get %s", alsabar.cmd, alsabar.channel)))

         local mixer = f:read("*a")
         f:close()
 
         local mixer = f:read("*a")
         f:close()
 


@@ -148,8 +148,6 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer("alsabar", timeout, alsabar.update)
-

     alsabar.bar:buttons (awful.util.table.join (
           awful.button ({}, 1, function()
             awful.util.spawn(alsabar.mixer)
     alsabar.bar:buttons (awful.util.table.join (
           awful.button ({}, 1, function()
             awful.util.spawn(alsabar.mixer)


@@ -168,6 +166,10 @@ local function worker(args)
           end)
     ))
 
           end)
     ))
 

+    timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
+
+    newtimer(timer_id, timeout, alsabar.update)
+

     return alsabar
 end
 
     return alsabar
 end