Allow multiple instances of the pulseaudio widget

[etc/awesome.git] / widgets / alsa.lua

diff --git a/widgets/alsa.lua b/widgets/alsa.lua
index c86db3340bbf3350d85bb6c57075e15414dd7136..f73194b2a6c9b23dfc35394ed48864fd856e3dad 100644 (file)
--- a/widgets/alsa.lua
+++ b/widgets/alsa.lua
@@ -16,9 +16,9 @@ local setmetatable = setmetatable
 
 -- ALSA volume
 -- lain.widgets.alsa
 
 -- ALSA volume
 -- lain.widgets.alsa

-local alsa = helpers.make_widget_textbox()

 
 local function worker(args)
 
 local function worker(args)

+    local alsa     = { widget = wibox.widget.textbox() }

     local args     = args or {}
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end
     local args     = args or {}
     local timeout  = args.timeout or 5
     local settings = args.settings or function() end


@@ -27,15 +27,17 @@ local function worker(args)
     alsa.channel       = args.channel or "Master"
     alsa.togglechannel = args.togglechannel
 
     alsa.channel       = args.channel or "Master"
     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 }


@@ -46,11 +48,9 @@ local function worker(args)
         end)
     end
 
         end)
     end
 

-    timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
-
-    helpers.newtimer(timer_id, timeout, alsa.update)
+    helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update)

 
     return alsa
 end
 
 
     return alsa
 end
 

-return setmetatable(alsa, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })