X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/ff61857e157b8f32e861016a6f151a7d1ddcd2da..fc5974a9c2838efa8dedbd350d9623e193ab71a3:/widgets/alsabar.lua?ds=sidebyside

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index bc8d8d3..a4c63ea 100644
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -44,9 +44,9 @@ local function worker(args)
 
     alsabar.cmd                 = args.cmd or "amixer"
     alsabar.channel             = args.channel or "Master"
+    alsabar.togglechannel       = args.togglechannel
     alsabar.colors              = args.colors or alsabar.colors
     alsabar.followtag           = args.followtag or false
-    alsabar._notify             = args.notify or "on"
     alsabar.notification_preset = args.notification_preset
 
     if not alsabar.notification_preset then
@@ -54,6 +54,11 @@ local function worker(args)
         alsabar.notification_preset.font = "Monospace 11"
     end
 
+    if alsabar.togglechannel then
+        alsabar.cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s",
+        alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) }
+    end
+
     alsabar.bar = wibox.widget {
         forced_height    = height,
         forced_width     = width,
@@ -119,9 +124,7 @@ local function worker(args)
         end)
     end
 
-    timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
-
-    helpers.newtimer(timer_id, timeout, alsabar.update)
+    helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update)
 
     return alsabar
 end