From 1574793252a5b5ac22734d9d7a26dd4f6869b72e Mon Sep 17 00:00:00 2001 From: luke bonham Date: Wed, 24 Jun 2015 13:50:34 +0200 Subject: [PATCH] alsa, alsabar: make amixer call customizable; fixes #111 in general --- widgets/alsa.lua | 4 ++-- widgets/alsabar.lua | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/widgets/alsa.lua b/widgets/alsa.lua index 7d25096..a356892 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -26,13 +26,13 @@ local function worker(args) local timeout = args.timeout or 5 local settings = args.settings or function() end - alsa.card = args.card or "0" + alsa.cmd = args.cmd or "amixer" alsa.channel = args.channel or "Master" alsa.widget = wibox.widget.textbox('') function alsa.update() - local f = assert(io.popen(string.format("amixer -c %s -M get %s", alsa.card, alsa.channel))) + local f = assert(io.popen(string.format("%s get %s", alsa.cmd, alsa.channel))) local mixer = f:read("*a") f:close() diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index b2cba9e..1421975 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -70,9 +70,11 @@ function alsabar.notify() preset.title = alsabar.channel .. " - " .. alsabar._current_level .. "%" end - local int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size) - preset.text = string.format("[%s%s]", string.rep("|", int), - string.rep(" ", alsabar.notifications.bar_size - int)) + int = math.modf((alsabar._current_level / 100) * alsabar.notifications.bar_size) + preset.text = "[" + .. string.rep("|", int) + .. string.rep(" ", alsabar.notifications.bar_size - int) + .. "]" if alsabar._notify ~= nil then alsabar._notify = naughty.notify ({ @@ -87,19 +89,19 @@ function alsabar.notify() 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 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() @@ -115,7 +117,7 @@ local function worker(args) 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() -- 2.39.5