From 03fdf984e93d81ed95945db51c83baf6c23e89e8 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Tue, 24 Jan 2017 21:33:16 +0100 Subject: [PATCH] fix and complete pull #286 --- widgets/alsa.lua | 8 +++++--- widgets/alsabar.lua | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/widgets/alsa.lua b/widgets/alsa.lua index cb7ba49..93c74cc 100644 --- a/widgets/alsa.lua +++ b/widgets/alsa.lua @@ -23,19 +23,21 @@ local function worker(args) local timeout = args.timeout or 5 local settings = args.settings or function() end + alsa.cmd = args.cmd or "amixer" alsa.channel = args.channel or "Master" - alsa.cmd = args.cmd or "amixer sget " .. alsa.channel alsa.togglechannel = args.togglechannel + local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel) + if alsa.togglechannel then - alsa.cmd = { shell, "-c", string.format("%s get %s; %s get %s", + format_cmd = { shell, "-c", string.format("%s get %s; %s get %s", alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) } end alsa.last = {} function alsa.update() - helpers.async(alsa.cmd, function(mixer) + helpers.async(format_cmd, function(mixer) local l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)") if alsa.last.level ~= l or alsa.last.status ~= s then volume_now = { level = l, status = s } diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index a4c63ea..c3e3d9d 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -54,8 +54,10 @@ local function worker(args) alsabar.notification_preset.font = "Monospace 11" end + local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel) + if alsabar.togglechannel then - alsabar.cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s", + format_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s", alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) } end @@ -75,7 +77,7 @@ local function worker(args) alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } }) function alsabar.update(callback) - helpers.async(alsabar.cmd, function(mixer) + helpers.async(format_cmd, function(mixer) local volu,mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted) then alsabar._current_level = tonumber(volu) or alsabar._current_level -- 2.39.5