fix and complete pull #286

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index cb7ba49add0df8fbfcb8a7d6168e950eda72e467..93c74ccb0246d34c8820dc16707feb73a7686582 100644 (file)
--- 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
 
     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.channel       = args.channel or "Master"

-    alsa.cmd           = args.cmd or "amixer sget " .. alsa.channel

     alsa.togglechannel = args.togglechannel
 
     alsa.togglechannel = args.togglechannel
 

+    local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel)
+

     if alsa.togglechannel then
     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()
         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 }
             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 a4c63eaef28778d54f51adc82404bffa9332b0bb..c3e3d9d95b970e6000f34924f16acd13dc53502c 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -54,8 +54,10 @@ local function worker(args)
         alsabar.notification_preset.font = "Monospace 11"
     end
 
         alsabar.notification_preset.font = "Monospace 11"
     end
 

+    local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel)
+

     if alsabar.togglechannel then
     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
 
         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)
     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
             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