X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0dc66396376f4c96ec538415cca961015a045d98..fc6e880da40668c6e9bd9da3786ff2fcae519c75:/widget/pulsebar.lua diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua index e96658b..41a8ce3 100644 --- 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 -local pulsebar = { - colors = { - background = "#000000", - mute = "#EB8F8F", - unmute = "#A4CE8A" - }, - - _current_level = 0, - _muted = false -} 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 @@ -48,6 +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.device = "N/A" if not pulsebar.notification_preset then pulsebar.notification_preset = {} @@ -69,7 +69,7 @@ local function factory(args) 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 = { @@ -78,6 +78,8 @@ local function factory(args) muted = string.match(s, "muted: (%S+)") or "N/A" } + pulsebar.device = volume_now.index + local ch = 1 volume_now.channel = {} for v in string.gmatch(s, ":.-(%d+)%%") do @@ -143,4 +145,4 @@ local function factory(args) return pulsebar end -return setmetatable(pulsebar, { __call = function(_, ...) return factory(...) end }) +return factory