widgets: no global tables, but one instance per call; closes #336; closes #337

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

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index 4386d20b3ece454e52dd3742ccc29f620a51e3a3..2ad021048a82880e6e79717ce38f2384ff05aab4 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -7,32 +7,31 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
-local awful        = require("awful")
-local naughty      = require("naughty")
-local wibox        = require("wibox")
-local math         = { modf   = math.modf }
-local string       = { format = string.format,
-                       match  = string.match,
-                       rep    = string.rep }
-local type         = type
-local tonumber     = tonumber
-local setmetatable = setmetatable
+local helpers        = require("lain.helpers")
+local awful          = require("awful")
+local naughty        = require("naughty")
+local wibox          = require("wibox")
+local math           = { modf   = math.modf }
+local string         = { format = string.format,
+                         match  = string.match,
+                         rep    = string.rep }
+local type, tonumber = type, tonumber
 
 -- ALSA volume bar
 -- lain.widget.alsabar
-local alsabar = {
-    colors = {
-        background = "#000000",
-        mute       = "#EB8F8F",
-        unmute     = "#A4CE8A"
-    },
-
-    _current_level = 0,
-    _muted         = false
-}
-
-local function worker(args)
+
+local function factory(args)
+    local alsabar = {
+        colors = {
+            background = "#000000",
+            mute       = "#EB8F8F",
+            unmute     = "#A4CE8A"
+        },
+
+        _current_level = 0,
+        _muted         = false
+    }
+
     local args       = args or {}
     local timeout    = args.timeout or 5
     local settings   = args.settings or function() end
@@ -40,7 +39,6 @@ local function worker(args)
     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"
@@ -70,8 +68,7 @@ local function worker(args)
         paddings         = 1,
         ticks            = ticks,
         ticks_size       = ticks_size,
-        widget           = wibox.widget.progressbar,
-        layout           = vertical and wibox.container.rotate
+        widget           = wibox.widget.progressbar
     }
 
     alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } })
@@ -135,4 +132,4 @@ local function worker(args)
     return alsabar
 end
 
-return setmetatable(alsabar, { __call = function(_, ...) return worker(...) end })
+return factory