wiki updated

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

diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua
index 74765f512f5988e6d0c99b76c4d8620c787f9418..41a8ce36b608525ff3e164f8c006f25309fa2d47 100644 (file)
--- a/widget/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -7,33 +7,32 @@
                                                   
 --]]
 
                                                   
 --]]
 

-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,
-                       gmatch = string.gmatch,
-                       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,
+                         gmatch = string.gmatch,
+                         rep    = string.rep }
+local type, tonumber = type, tonumber

 
 -- Pulseaudio volume bar
 -- lain.widget.pulsebar
 
 -- Pulseaudio volume bar
 -- lain.widget.pulsebar

-local pulsebar = {
-    colors = {
-        background = "#000000",
-        mute       = "#EB8F8F",
-        unmute     = "#A4CE8A"
-    },
-
-    _current_level = 0,
-    _muted         = false
-}

 
 local function factory(args)
 
 local function factory(args)

+    local pulsebar = {
+        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
     local args       = args or {}
     local timeout    = args.timeout or 5
     local settings   = args.settings or function() end


@@ -48,7 +47,7 @@ local function factory(args)
     pulsebar.colors        = args.colors or pulsebar.colors
     pulsebar.followtag     = args.followtag or false
     pulsebar.notifications = args.notification_preset
     pulsebar.colors        = args.colors or pulsebar.colors
     pulsebar.followtag     = args.followtag or false
     pulsebar.notifications = args.notification_preset

-    pulseaudio.device      = "N/A"
+    pulsebar.device        = "N/A"

 
     if not pulsebar.notification_preset then
         pulsebar.notification_preset      = {}
 
     if not pulsebar.notification_preset then
         pulsebar.notification_preset      = {}


@@ -70,7 +69,7 @@ local function factory(args)
     pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } })
 
     function pulsebar.update(callback)
     pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } })
 
     function pulsebar.update(callback)

-        if scallback then pulseaudio.cmd = scallback() end
+        if scallback then pulsebar.cmd = scallback() end

 
         helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s)
             volume_now = {
 
         helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s)
             volume_now = {


@@ -79,7 +78,7 @@ local function factory(args)
                 muted = string.match(s, "muted: (%S+)") or "N/A"
             }
 
                 muted = string.match(s, "muted: (%S+)") or "N/A"
             }
 

-            pulseaudio.device = volume_now.index
+            pulsebar.device = volume_now.index

 
             local ch = 1
             volume_now.channel = {}
 
             local ch = 1
             volume_now.channel = {}


@@ -146,4 +145,4 @@ local function factory(args)
     return pulsebar
 end
 
     return pulsebar
 end
 

-return setmetatable(pulsebar, { __call = function(_, ...) return factory(...) end })
+return factory